diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 22:02:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-11 22:02:01 +0000 |
| commit | ee3ed107740d758b030e58c176d28385bd566e89 (patch) | |
| tree | 8307c3db02c2f3cad1a6912e8fc46b37c15013b1 /ash/shell | |
| parent | 7b32ab26c844eb5283e1b0248b7a3c00a5414ae3 (diff) | |
| download | chromium_src-ee3ed107740d758b030e58c176d28385bd566e89.zip chromium_src-ee3ed107740d758b030e58c176d28385bd566e89.tar.gz chromium_src-ee3ed107740d758b030e58c176d28385bd566e89.tar.bz2 | |
Move files from ui/views/corewm to ui/wm/core
R=sky@chromium.org
TBR=sky@chromium.org
http://crbug.com/308710
Review URL: https://codereview.chromium.org/194843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 2 | ||||
| -rw-r--r-- | ash/shell/keyboard_controller_proxy_stub.cc | 2 | ||||
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 2 | ||||
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 42eee00..edb6e1a 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -29,8 +29,8 @@ #include "ui/compositor/compositor.h" #include "ui/gfx/screen.h" #include "ui/message_center/message_center.h" -#include "ui/views/corewm/wm_state.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/wm/core/wm_state.h" #if defined(USE_X11) #include "ui/events/x/touch_factory_x11.h" diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc index 4a82ff1..d73ebb3 100644 --- a/ash/shell/keyboard_controller_proxy_stub.cc +++ b/ash/shell/keyboard_controller_proxy_stub.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ui/aura/window.h" -#include "ui/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" using namespace content; diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index a715efa..557df157 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -24,7 +24,7 @@ #include "ash/wm/window_state.h" #include "base/message_loop/message_loop.h" #include "ui/aura/window.h" -#include "ui/views/corewm/input_method_event_filter.h" +#include "ui/wm/core/input_method_event_filter.h" namespace ash { namespace shell { diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index fad37b9..5d1b314 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -29,11 +29,11 @@ #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" -#include "ui/views/corewm/shadow_types.h" #include "ui/views/examples/examples_window_with_content.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/test/child_modal_window.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/shadow_types.h" using views::MenuItemView; using views::MenuRunner; |