Ash: Remove compact window mode.

Remove MultipleWindowIndicatorButton
Clean up OpaqueBrowserFrameView
Remove CompactBrowserFrameView
Remove ash/wm/compact_layout_manager and compact_status_area_layout_manager
Remove window mode switches
Remove window mode from ash::Shell
Remove ShellDelegate::CycleOrder
Remove ShellDelegate::GetOverrideWindowMode
Remove all outside calls to Shell::IsWindowModeCompact

BUG=117284
TEST=existing tests

Review URL: https://chromiumcodereview.appspot.com/9630002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125625 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 41 deletions

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 5fca288..e23ab8a 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -21,9 +21,6 @@ AshTestBase::~AshTestBase() {
 void AshTestBase::SetUp() {
   // Creates Shell and hook with Desktop.
   TestShellDelegate* delegate = new TestShellDelegate;
-  Shell::WindowMode window_mode = Shell::MODE_MANAGED;
-  if (GetOverrideWindowMode(&window_mode))
-    delegate->SetOverrideWindowMode(window_mode);
   ash::Shell::CreateInstance(delegate);
 
   helper_.SetUp();
@@ -43,10 +40,6 @@ void AshTestBase::TearDown() {
   Shell::DeleteInstance();
 }
 
-bool AshTestBase::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
-  return false;
-}
-
 void AshTestBase::RunAllPendingInMessageLoop() {
   helper_.RunAllPendingInMessageLoop(Shell::GetRootWindow());
 }
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 85a1f35..e7b929f 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -24,9 +24,6 @@ class AshTestBase : public testing::Test {
   virtual void TearDown() OVERRIDE;
 
  protected:
-  // Overridden by test cases to specify what window mode to run the shell in.
-  virtual bool GetOverrideWindowMode(Shell::WindowMode* window_mode);
-
   void RunAllPendingInMessageLoop();
 
  private:
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 6ec4864..16caee5 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -15,19 +15,12 @@
 namespace ash {
 namespace test {
 
-TestShellDelegate::TestShellDelegate()
-    : override_window_mode_(false),
-      window_mode_(Shell::MODE_MANAGED) {
+TestShellDelegate::TestShellDelegate() {
 }
 
 TestShellDelegate::~TestShellDelegate() {
 }
 
-void TestShellDelegate::SetOverrideWindowMode(Shell::WindowMode window_mode) {
-  override_window_mode_ = true;
-  window_mode_ = window_mode;
-}
-
 views::Widget* TestShellDelegate::CreateStatusArea() {
   return NULL;
 }
@@ -45,17 +38,14 @@ AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
 }
 
 std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList(
-    CycleSource source,
-    CycleOrder order) const {
+    CycleSource source) const {
   // We just use the Shell's default container of windows, so tests can be
   // written with the usual CreateTestWindowWithId() calls. But window cycling
-  // expects the topmost window at the front of the list, so reverse the order
-  // if we are mimicking MRU.
+  // expects the topmost window at the front of the list, so reverse the order.
   aura::Window* default_container = Shell::GetInstance()->GetContainer(
       internal::kShellWindowId_DefaultContainer);
   std::vector<aura::Window*> windows = default_container->children();
-  if (order != ShellDelegate::ORDER_LINEAR)
-    std::reverse(windows.begin(), windows.end());
+  std::reverse(windows.begin(), windows.end());
   return windows;
 }
 
@@ -75,13 +65,5 @@ SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
   return NULL;
 }
 
-bool TestShellDelegate::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
-  if (override_window_mode_) {
-    *window_mode = window_mode_;
-    return true;
-  }
-  return false;
-}
-
 }  // namespace test
 }  // namespace ash
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 30f6f44..888b732 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -17,8 +17,6 @@ class TestShellDelegate : public ShellDelegate {
   TestShellDelegate();
   virtual ~TestShellDelegate();
 
-  void SetOverrideWindowMode(Shell::WindowMode window_mode);
-
   // Overridden from ShellDelegate:
   virtual views::Widget* CreateStatusArea() OVERRIDE;
 #if defined(OS_CHROMEOS)
@@ -27,19 +25,14 @@ class TestShellDelegate : public ShellDelegate {
   virtual void Exit() OVERRIDE;
   virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual std::vector<aura::Window*> GetCycleWindowList(
-      CycleSource source,
-      CycleOrder order) const OVERRIDE;
+      CycleSource source) const OVERRIDE;
   virtual void StartPartialScreenshot(
       ScreenshotDelegate* screenshot_delegate) OVERRIDE;
   virtual LauncherDelegate* CreateLauncherDelegate(
       ash::LauncherModel* model) OVERRIDE;
   virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;
-  virtual bool GetOverrideWindowMode(Shell::WindowMode* window_mode) OVERRIDE;
 
  private:
-  bool override_window_mode_;
-  Shell::WindowMode window_mode_;
-
   DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
 };