summaryrefslogtreecommitdiffstats
path: root/ash/shell/shell_main.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 19:06:32 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 19:06:32 +0000
commitdb9131601d13e57554df51916199eba371b7264b (patch)
tree28726f42e5ab82c95ff79a0167e1d71ab9682959 /ash/shell/shell_main.cc
parentf56b47dc4f7b68cd627d8cb874879bf80e01e50d (diff)
downloadchromium_src-db9131601d13e57554df51916199eba371b7264b.zip
chromium_src-db9131601d13e57554df51916199eba371b7264b.tar.gz
chromium_src-db9131601d13e57554df51916199eba371b7264b.tar.bz2
Convert a bunch of AuraTestBase users to AshTestBase.
http://crbug.com/112131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9522012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_main.cc')
-rw-r--r--ash/shell/shell_main.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index 0f2d5b4..34611d3 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -213,6 +213,11 @@ class ShellDelegateImpl : public ash::ShellDelegate {
return NULL;
}
+ virtual bool GetOverrideWindowMode(
+ ash::Shell::WindowMode* window_mode) OVERRIDE {
+ return false;
+ }
+
private:
// Used to update Launcher. Owned by main.
WindowWatcher* watcher_;