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 /win8 | |
| 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 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view.cc | 2 | ||||
| -rw-r--r-- | win8/metro_driver/chrome_app_view.h | 2 | ||||
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 2 | ||||
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.h | 2 | ||||
| -rw-r--r-- | win8/metro_driver/file_picker.cc | 2 | ||||
| -rw-r--r-- | win8/metro_driver/file_picker_ash.cc | 2 | ||||
| -rw-r--r-- | win8/test/open_with_dialog_controller.cc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/win8/metro_driver/chrome_app_view.cc b/win8/metro_driver/chrome_app_view.cc index 15c48d63ac..79bd58474b 100644 --- a/win8/metro_driver/chrome_app_view.cc +++ b/win8/metro_driver/chrome_app_view.cc @@ -12,7 +12,7 @@ #include <algorithm> #include "base/bind.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/win/metro.h" // This include allows to send WM_SYSCOMMANDs to chrome. #include "chrome/app/chrome_command_ids.h" diff --git a/win8/metro_driver/chrome_app_view.h b/win8/metro_driver/chrome_app_view.h index ced5cca125..0554ab3136 100644 --- a/win8/metro_driver/chrome_app_view.h +++ b/win8/metro_driver/chrome_app_view.h @@ -16,7 +16,7 @@ #include <utility> #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/synchronization/lock.h" #include "win8/metro_driver/chrome_url_launch_handler.h" #include "win8/metro_driver/devices_handler.h" diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 12b77fe903..0fdd9327ce 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/threading/thread.h" diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h index 52ab382a79..57f20b95c4 100644 --- a/win8/metro_driver/chrome_app_view_ash.h +++ b/win8/metro_driver/chrome_app_view_ash.h @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "ui/base/events/event_constants.h" #include "win8/metro_driver/direct3d_helper.h" diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc index 92fd987ae8..4557665b2a 100644 --- a/win8/metro_driver/file_picker.cc +++ b/win8/metro_driver/file_picker.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/files/file_path.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/synchronization/waitable_event.h" #include "base/win/metro.h" diff --git a/win8/metro_driver/file_picker_ash.cc b/win8/metro_driver/file_picker_ash.cc index a4b16229a2..fbccee57ba 100644 --- a/win8/metro_driver/file_picker_ash.cc +++ b/win8/metro_driver/file_picker_ash.cc @@ -7,7 +7,7 @@ #include "base/bind.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/synchronization/waitable_event.h" #include "base/win/metro.h" diff --git a/win8/test/open_with_dialog_controller.cc b/win8/test/open_with_dialog_controller.cc index 859037bfe9..86b8161561 100644 --- a/win8/test/open_with_dialog_controller.cc +++ b/win8/test/open_with_dialog_controller.cc @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread_checker.h" |