diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:19:54 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:19:54 +0000 |
| commit | 4e2d03e2a57d65fd7dbddc80dc355f676c93b782 (patch) | |
| tree | 9c0040e6c2c979bd30b661323e4991278dfd4f93 /ui | |
| parent | 099bc7e6c3ef7da24f2be9d90c551cfb48a1de67 (diff) | |
| download | chromium_src-4e2d03e2a57d65fd7dbddc80dc355f676c93b782.zip chromium_src-4e2d03e2a57d65fd7dbddc80dc355f676c93b782.tar.gz chromium_src-4e2d03e2a57d65fd7dbddc80dc355f676c93b782.tar.bz2 | |
Use a direct include of the message_loop header in ui/, part 1.
BUG=260807
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19629002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
43 files changed, 44 insertions, 48 deletions
diff --git a/ui/app_list/cocoa/test/apps_grid_controller_test_helper.h b/ui/app_list/cocoa/test/apps_grid_controller_test_helper.h index f745b40..1e2eb27 100644 --- a/ui/app_list/cocoa/test/apps_grid_controller_test_helper.h +++ b/ui/app_list/cocoa/test/apps_grid_controller_test_helper.h @@ -6,7 +6,7 @@ #define UI_APP_LIST_COCOA_TEST_APPS_GRID_CONTROLLER_TEST_HELPER_H_ #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #import "ui/base/test/ui_cocoa_test_helper.h" @class AppsGridController; diff --git a/ui/app_list/pagination_model_unittest.cc b/ui/app_list/pagination_model_unittest.cc index 8f8e34b..391ed87 100644 --- a/ui/app_list/pagination_model_unittest.cc +++ b/ui/app_list/pagination_model_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/app_list/pagination_model_observer.h" diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc index 95fa5dd..87d5f67 100644 --- a/ui/app_list/views/apps_grid_view_unittest.cc +++ b/ui/app_list/views/apps_grid_view_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/timer/timer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/app_list/app_list_item_model.h" diff --git a/ui/app_list/views/search_result_list_view.cc b/ui/app_list/views/search_result_list_view.cc index 7fb8763..b57f82f 100644 --- a/ui/app_list/views/search_result_list_view.cc +++ b/ui/app_list/views/search_result_list_view.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/bind.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/app_list/search_result_list_view_delegate.h" #include "ui/app_list/views/search_result_view.h" #include "ui/base/events/event.h" diff --git a/ui/aura/client/dispatcher_client.h b/ui/aura/client/dispatcher_client.h index 136e70d..c775611 100644 --- a/ui/aura/client/dispatcher_client.h +++ b/ui/aura/client/dispatcher_client.h @@ -5,9 +5,9 @@ #ifndef UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ #define UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ +#include "base/message_loop/message_loop.h" #include "ui/aura/aura_export.h" #include "ui/aura/window.h" -#include "base/message_loop.h" namespace aura { class RootWindow; diff --git a/ui/aura/dispatcher_win.cc b/ui/aura/dispatcher_win.cc index 2b4ca8a..7160dc7 100644 --- a/ui/aura/dispatcher_win.cc +++ b/ui/aura/dispatcher_win.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" namespace aura { diff --git a/ui/aura/env.h b/ui/aura/env.h index 535b51e..ad31cd5 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -6,7 +6,7 @@ #define UI_AURA_ENV_H_ #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/observer_list.h" #include "ui/aura/aura_export.h" #include "ui/base/events/event_handler.h" diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc index 459d045..f5dc26b 100644 --- a/ui/aura/remote_root_window_host_win.cc +++ b/ui/aura/remote_root_window_host_win.cc @@ -8,7 +8,7 @@ #include <algorithm> -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" #include "ui/aura/client/capture_client.h" diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index f3bde36..3df23c5 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/logging.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/cursor_client.h" diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 9d67038..0e40d8a 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/aura_export.h" #include "ui/aura/client/capture_delegate.h" #include "ui/aura/root_window_host_delegate.h" diff --git a/ui/aura/root_window_host.h b/ui/aura/root_window_host.h index 64059ad..09e48fa 100644 --- a/ui/aura/root_window_host.h +++ b/ui/aura/root_window_host.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/aura_export.h" #include "ui/base/cursor/cursor.h" #include "ui/gfx/native_widget_types.h" diff --git a/ui/aura/root_window_host_ozone.h b/ui/aura/root_window_host_ozone.h index 107f2bf..9f072d8 100644 --- a/ui/aura/root_window_host_ozone.h +++ b/ui/aura/root_window_host_ozone.h @@ -8,7 +8,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/root_window_host.h" #include "ui/base/ozone/event_factory_ozone.h" #include "ui/gfx/rect.h" diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/root_window_host_win.cc index 6af57e8..5c67b77 100644 --- a/ui/aura/root_window_host_win.cc +++ b/ui/aura/root_window_host_win.cc @@ -8,7 +8,7 @@ #include <algorithm> -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/root_window.h" diff --git a/ui/aura/root_window_host_x11.h b/ui/aura/root_window_host_x11.h index 9a4b377..b3b2788 100644 --- a/ui/aura/root_window_host_x11.h +++ b/ui/aura/root_window_host_x11.h @@ -13,7 +13,7 @@ #undef RootWindow #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/aura_export.h" #include "ui/aura/env_observer.h" #include "ui/aura/root_window_host.h" diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h index c898f28..791b955 100644 --- a/ui/aura/test/aura_test_base.h +++ b/ui/aura/test/aura_test_base.h @@ -5,9 +5,9 @@ #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ #define UI_AURA_TEST_AURA_TEST_BASE_H_ -#include "base/compiler_specific.h" #include "base/basictypes.h" -#include "base/message_loop.h" +#include "base/compiler_specific.h" +#include "base/message_loop/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/test/aura_test_helper.h" diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index 0cd0704..84d46d0 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -4,7 +4,7 @@ #include "ui/aura/test/aura_test_helper.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/default_capture_client.h" diff --git a/ui/aura/test/ui_controls_factory_aurawin.cc b/ui/aura/test/ui_controls_factory_aurawin.cc index 34a009e..48997fe 100644 --- a/ui/aura/test/ui_controls_factory_aurawin.cc +++ b/ui/aura/test/ui_controls_factory_aurawin.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/aura/root_window.h" #include "ui/aura/test/ui_controls_factory_aura.h" #include "ui/base/test/ui_controls_aura.h" diff --git a/ui/base/animation/test_animation_delegate.h b/ui/base/animation/test_animation_delegate.h index ada0c836..3cdaf8c 100644 --- a/ui/base/animation/test_animation_delegate.h +++ b/ui/base/animation/test_animation_delegate.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_ANIMATION_TEST_ANIMATION_DELEGATE_H_ #define UI_BASE_ANIMATION_TEST_ANIMATION_DELEGATE_H_ -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/animation/animation_delegate.h" namespace ui { diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc index 7595ddf..f131e0e 100644 --- a/ui/base/clipboard/clipboard_unittest.cc +++ b/ui/base/clipboard/clipboard_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/pickle.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -27,10 +27,6 @@ #include "base/android/jni_android.h" #endif -#if defined(OS_WIN) || defined(USE_AURA) -#include "base/message_loop.h" -#endif - namespace ui { class ClipboardTest : public PlatformTest { diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index bcd9037..6548448 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -15,7 +15,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/shared_memory.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/safe_numerics.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm index f4cdf0f..7cec6c6 100644 --- a/ui/base/cocoa/menu_controller_unittest.mm +++ b/ui/base/cocoa/menu_controller_unittest.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "grit/ui_resources.h" diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc index 4d5bc56..f2d243d 100644 --- a/ui/base/dragdrop/os_exchange_data_unittest.cc +++ b/ui/base/dragdrop/os_exchange_data_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/ime/win/tsf_bridge.cc b/ui/base/ime/win/tsf_bridge.cc index 8a83b4f..4186bc78 100644 --- a/ui/base/ime/win/tsf_bridge.cc +++ b/ui/base/ime/win/tsf_bridge.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/threading/thread_local_storage.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_variant.h" diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc index 3b1be189..2687822 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -5,7 +5,7 @@ #include "ui/base/models/simple_menu_model.h" #include "base/bind.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" diff --git a/ui/base/ozone/touch_event_converter_ozone_unittest.cc b/ui/base/ozone/touch_event_converter_ozone_unittest.cc index e163180..8886c51 100644 --- a/ui/base/ozone/touch_event_converter_ozone_unittest.cc +++ b/ui/base/ozone/touch_event_converter_ozone_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "base/run_loop.h" #include "base/time/time.h" diff --git a/ui/base/test/ui_controls_gtk.cc b/ui/base/test/ui_controls_gtk.cc index a91e28c..3342a3d 100644 --- a/ui/base/test/ui_controls_gtk.cc +++ b/ui/base/test/ui_controls_gtk.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/gtk/event_synthesis_gtk.h" #include "ui/base/gtk/gtk_screen_util.h" #include "ui/gfx/rect.h" diff --git a/ui/base/test/ui_controls_internal_win.cc b/ui/base/test/ui_controls_internal_win.cc index 990145c..e5110da1 100644 --- a/ui/base/test/ui_controls_internal_win.cc +++ b/ui/base/test/ui_controls_internal_win.cc @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/ui/base/test/ui_controls_mac.mm b/ui/base/test/ui_controls_mac.mm index 5303c6f9..72f8325 100644 --- a/ui/base/test/ui_controls_mac.mm +++ b/ui/base/test/ui_controls_mac.mm @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/keycodes/keyboard_code_conversion_mac.h" diff --git a/ui/base/test/ui_controls_win.cc b/ui/base/test/ui_controls_win.cc index a7bf4d0..65de0a1 100644 --- a/ui/base/test/ui_controls_win.cc +++ b/ui/base/test/ui_controls_win.cc @@ -5,7 +5,7 @@ #include "ui/base/test/ui_controls.h" #include "base/callback.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/test/ui_controls_internal_win.h" #include "ui/gfx/point.h" #include "ui/views/view.h" diff --git a/ui/base/touch/touch_factory_x11.cc b/ui/base/touch/touch_factory_x11.cc index 3213e04..ccbc4dc 100644 --- a/ui/base/touch/touch_factory_x11.cc +++ b/ui/base/touch/touch_factory_x11.cc @@ -14,7 +14,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "ui/base/ui_base_switches.h" diff --git a/ui/base/win/singleton_hwnd.cc b/ui/base/win/singleton_hwnd.cc index 2f5d7c0..9d1685f 100644 --- a/ui/base/win/singleton_hwnd.cc +++ b/ui/base/win/singleton_hwnd.cc @@ -5,7 +5,7 @@ #include "ui/base/win/singleton_hwnd.h" #include "base/memory/singleton.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" namespace ui { diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index 324cdd13..663a9eb 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -25,7 +25,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index 5226a6f..f36bf46 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/memory/singleton.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/threading/thread.h" diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index 327821b..aa78d93 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "cc/animation/animation_events.h" #include "cc/animation/layer_animation_event_observer.h" #include "cc/base/scoped_ptr_vector.h" diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 8188cd6..79ef288 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #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/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/ui/compositor/test/test_compositor_host_ozone.cc b/ui/compositor/test/test_compositor_host_ozone.cc index 153ad7a..82158f3 100644 --- a/ui/compositor/test/test_compositor_host_ozone.cc +++ b/ui/compositor/test/test_compositor_host_ozone.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/compositor/compositor.h" #include "ui/gfx/rect.h" diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc index 4c4b9e5..b883357 100644 --- a/ui/compositor/test/test_compositor_host_x11.cc +++ b/ui/compositor/test/test_compositor_host_x11.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/x/x11_util.h" #include "ui/compositor/compositor.h" #include "ui/gfx/rect.h" diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc index e6ca68c..58329f2 100644 --- a/ui/compositor/test/test_suite.cc +++ b/ui/compositor/test/test_suite.cc @@ -5,7 +5,7 @@ #include "ui/compositor/test/test_suite.h" #include "base/command_line.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/base/ui_base_paths.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_switches.h" diff --git a/ui/gl/gl_image_glx.cc b/ui/gl/gl_image_glx.cc index 12aa95f..85254f3 100644 --- a/ui/gl/gl_image_glx.cc +++ b/ui/gl/gl_image_glx.cc @@ -11,7 +11,7 @@ extern "C" { #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_surface_glx.h" diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc index 18e5406..2e28665 100644 --- a/ui/gl/gl_surface_egl.cc +++ b/ui/gl/gl_surface_egl.cc @@ -15,7 +15,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "build/build_config.h" #include "ui/gl/egl_util.h" #include "ui/gl/gl_context.h" diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc index 7d819fd..964a523 100644 --- a/ui/gl/gl_surface_glx.cc +++ b/ui/gl/gl_surface_glx.cc @@ -13,7 +13,7 @@ extern "C" { #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "base/process_util.h" #include "base/synchronization/cancellation_flag.h" #include "base/synchronization/lock.h" diff --git a/ui/gl/gl_surface_x11.cc b/ui/gl/gl_surface_x11.cc index 1153b65..abb1e7b 100644 --- a/ui/gl/gl_surface_x11.cc +++ b/ui/gl/gl_surface_x11.cc @@ -7,7 +7,7 @@ #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "third_party/mesa/src/include/GL/osmesa.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_implementation.h" diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index 6a6cb7f..b0b4001 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" +#include "base/message_loop/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/root_window.h" |