diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-18 11:57:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-18 11:57:30 +0100 |
| commit | 9ab5563a3196760eb381d102cbb2bc0f7abc6a50 (patch) | |
| tree | 1c690f8b0c998ba536a0c7aeff34764383c7dff6 /cloud_print | |
| parent | 106cdaa9e420b49e5b1ef6941f08dd990128a374 (diff) | |
| download | chromium_org-9ab5563a3196760eb381d102cbb2bc0f7abc6a50.tar.gz | |
Merge from Chromium at DEPS revision r212225
This commit was generated by merge_to_master.py.
Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/gcp20/prototype/dns_sd_server.cc | 2 | ||||
| -rw-r--r-- | cloud_print/gcp20/prototype/gcp20_device.cc | 2 | ||||
| -rw-r--r-- | cloud_print/service/service_state.cc | 2 | ||||
| -rw-r--r-- | cloud_print/service/win/cloud_print_service_config.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cloud_print/gcp20/prototype/dns_sd_server.cc b/cloud_print/gcp20/prototype/dns_sd_server.cc index 60c955e09e..cecb8d5124 100644 --- a/cloud_print/gcp20/prototype/dns_sd_server.cc +++ b/cloud_print/gcp20/prototype/dns_sd_server.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "cloud_print/gcp20/prototype/dns_packet_parser.h" #include "cloud_print/gcp20/prototype/dns_response_builder.h" diff --git a/cloud_print/gcp20/prototype/gcp20_device.cc b/cloud_print/gcp20/prototype/gcp20_device.cc index 7965b46760..cbd0c86f43 100644 --- a/cloud_print/gcp20/prototype/gcp20_device.cc +++ b/cloud_print/gcp20/prototype/gcp20_device.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 6b9ccfcfcc..f2baddef25 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc @@ -7,7 +7,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "net/base/escape.h" diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc index cf8e777faf..14694cc448 100644 --- a/cloud_print/service/win/cloud_print_service_config.cc +++ b/cloud_print/service/win/cloud_print_service_config.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" |