Ash: Remove compact window mode.

chrome/browser/ui/views/ash/status_area_host_aura_browsertest.cc

 // 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.
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
@@ skipping 19 matching lines @@
 IN_PROC_BROWSER_TEST_F(StatusAreaHostAuraTest, TextStyle) {
   ChromeShellDelegate* delegate = static_cast<ChromeShellDelegate*>(
       ash::Shell::GetInstance()->delegate());
   StatusAreaHostAura* host = delegate->status_area_host();
 
 #if defined(OS_CHROMEOS)
   ASSERT_FALSE(chromeos::UserManager::Get()->IsUserLoggedIn());
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
     EXPECT_EQ(StatusAreaButton::GRAY_PLAIN_LIGHT,
               host->GetStatusAreaTextStyle());
-    EXPECT_EQ(StatusAreaHostAura::GetCompactModeLoginAndLockOffset().ToString(),
-              ash::Shell::GetInstance()->compact_status_area_offset().
-                  ToString());
   } else {
     EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,
               host->GetStatusAreaTextStyle());
-    EXPECT_EQ(StatusAreaHostAura::GetCompactModeBrowserOffset().ToString(),
-              ash::Shell::GetInstance()->compact_status_area_offset().
-                  ToString());
   }
 
   // ProfileManager expects a profile dir to be set on Chrome OS.
   CommandLine::ForCurrentProcess()->AppendSwitchNative(
       switches::kLoginProfile, "StatusAreaHostAuraTest");
   chromeos::UserManager::Get()->UserLoggedIn("foo@example.com");
   ASSERT_TRUE(chromeos::UserManager::Get()->IsUserLoggedIn());
 #endif
 
   Browser* browser = CreateBrowser(ProfileManager::GetDefaultProfile());
-
-  if (ash::Shell::GetInstance()->IsWindowModeCompact()) {
-    EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED_BOLD,
-              host->GetStatusAreaTextStyle());
-
-    Browser* incognito_browser = CreateIncognitoBrowser();
-    EXPECT_EQ(StatusAreaButton::WHITE_PLAIN_BOLD,
-              host->GetStatusAreaTextStyle());
-
-    incognito_browser->CloseWindow();
-    EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED_BOLD,
-              host->GetStatusAreaTextStyle());
-  } else {
-    EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,
-              host->GetStatusAreaTextStyle());
-  }
-
-  EXPECT_EQ(StatusAreaHostAura::GetCompactModeBrowserOffset().ToString(),
-            ash::Shell::GetInstance()->compact_status_area_offset().ToString());
+  EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,
+            host->GetStatusAreaTextStyle());
 
 #if defined(OS_CHROMEOS)
   // Lock the screen.
   chromeos::ScreenLocker::Show();
   scoped_ptr<chromeos::test::ScreenLockerTester> tester(
       chromeos::ScreenLocker::GetTester());
   tester->EmulateWindowManagerReady();
   ui_test_utils::WindowedNotificationObserver lock_state_observer(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::NotificationService::AllSources());
   if (!tester->IsLocked())
     lock_state_observer.Wait();
   ASSERT_TRUE(tester->IsLocked());
   EXPECT_EQ(StatusAreaButton::GRAY_PLAIN_LIGHT, host->GetStatusAreaTextStyle());
-  EXPECT_EQ(StatusAreaHostAura::GetCompactModeLoginAndLockOffset().ToString(),
-            ash::Shell::GetInstance()->compact_status_area_offset().ToString());
 
   chromeos::ScreenLocker::Hide();
   ui_test_utils::RunAllPendingInMessageLoop();
   ASSERT_FALSE(tester->IsLocked());
 
-  if (ash::Shell::GetInstance()->IsWindowModeCompact()) {
-    EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED_BOLD,
-              host->GetStatusAreaTextStyle());
-  } else {
-    EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,
-              host->GetStatusAreaTextStyle());
-  }
-  EXPECT_EQ(StatusAreaHostAura::GetCompactModeBrowserOffset().ToString(),
-            ash::Shell::GetInstance()->compact_status_area_offset().ToString());
+  EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,
+            host->GetStatusAreaTextStyle());
 #endif
 
   browser->CloseWindow();
 }