diff options
Diffstat (limited to 'ash/shelf')
-rw-r--r-- | ash/shelf/overflow_bubble.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_layout_manager_unittest.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_tooltip_manager.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_tooltip_manager_unittest.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_unittest.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_view.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_view_unittest.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_widget.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_widget_unittest.cc | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc index 05106ec..8a58d87 100644 --- a/ash/shelf/overflow_bubble.cc +++ b/ash/shelf/overflow_bubble.cc @@ -12,7 +12,7 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc index 0beb2d5..4f433ce 100644 --- a/ash/shelf/shelf.cc +++ b/ash/shelf/shelf.cc @@ -25,8 +25,8 @@ #include "ash/wm/window_properties.h" #include "grit/ash_resources.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 1639fc8..b1fcb8f 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -38,7 +38,7 @@ #include "base/strings/string_util.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index 928ff3e..8ee70ec 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -27,9 +27,9 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc index dd20a17..48b943f 100644 --- a/ash/shelf/shelf_tooltip_manager.cc +++ b/ash/shelf/shelf_tooltip_manager.cc @@ -13,8 +13,8 @@ #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/gfx/insets.h" diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc index 2294ba4..7ce38df 100644 --- a/ash/shelf/shelf_tooltip_manager_unittest.cc +++ b/ash/shelf/shelf_tooltip_manager_unittest.cc @@ -14,7 +14,7 @@ #include "ash/wm/window_util.h" #include "base/strings/string16.h" #include "base/time/time.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" #include "ui/events/event_handler.h" diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc index 475ee83..14b1b95 100644 --- a/ash/shelf/shelf_unittest.cc +++ b/ash/shelf/shelf_unittest.cc @@ -14,7 +14,7 @@ #include "ash/test/shelf_view_test_api.h" #include "ash/test/test_shelf_item_delegate.h" #include "ash/wm/window_util.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/corewm/corewm_switches.h" diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 8ce493e..845a4d0 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -36,8 +36,8 @@ #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/aura/client/screen_position_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index c044ad8..3b9956e 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc @@ -36,10 +36,10 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "grit/ash_resources.h" -#include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/events/event.h" diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index d5c5f90..3595833 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -23,8 +23,8 @@ #include "ash/wm/workspace_controller.h" #include "grit/ash_resources.h" #include "ui/aura/client/activation_client.h" -#include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index ed613bb..042fa3a 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc @@ -15,7 +15,7 @@ #include "ash/test/shelf_test_api.h" #include "ash/test/shelf_view_test_api.h" #include "ash/wm/window_util.h" -#include "ui/aura/root_window.h" +#include "ui/aura/window_event_dispatcher.h" #include "ui/events/event_utils.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" |