diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-04 21:26:56 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-04 21:26:56 +0000 |
commit | f2f61b38e56715e7d2d48fab35545d5c8a17c738 (patch) | |
tree | 8792e9acb44fbcde49ff4ac98279cf3ce603c081 /ash/shell.cc | |
parent | bb3a656af4a24fea92df42b90ae87512f140dbf3 (diff) | |
download | chromium_src-f2f61b38e56715e7d2d48fab35545d5c8a17c738.zip chromium_src-f2f61b38e56715e7d2d48fab35545d5c8a17c738.tar.gz chromium_src-f2f61b38e56715e7d2d48fab35545d5c8a17c738.tar.bz2 |
Merge BaseLayoutManager into WorkspaceLayoutManager
BUG=338906
R=pkotwicz@chromium.org
Review URL: https://codereview.chromium.org/153143003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r-- | ash/shell.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 986612e..a01990e 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -54,7 +54,6 @@ #include "ash/wm/app_list_controller.h" #include "ash/wm/ash_focus_rules.h" #include "ash/wm/ash_native_cursor_manager.h" -#include "ash/wm/base_layout_manager.h" #include "ash/wm/coordinate_conversion.h" #include "ash/wm/custom_frame_view_ash.h" #include "ash/wm/event_client_impl.h" |