Make packaged apps use AppNonClientFrameViewAsh when maximized

chrome/browser/ui/views/frame/app_browser_frame_view_ash_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/wm/caption_buttons/hideable_caption_button_container.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h"
+#include "chrome/browser/ui/views/frame/app_browser_frame_view_ash.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/screen.h"
 
@@ skipping 21 matching lines @@
 void MinimizeWindow(aura::Window* window) {
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
 }
 
 void RestoreWindow(Window* window) {
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
 }
 
 }  // namespace
 
-class AppNonClientFrameViewAshTest : public InProcessBrowserTest {
+class AppBrowserFrameViewAshTest : public InProcessBrowserTest {
  public:
-  AppNonClientFrameViewAshTest() : InProcessBrowserTest(), app_browser_(NULL) {
+  AppBrowserFrameViewAshTest() : InProcessBrowserTest(), app_browser_(NULL) {
   }
-  virtual ~AppNonClientFrameViewAshTest() {}
+  virtual ~AppBrowserFrameViewAshTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     Browser::CreateParams params = Browser::CreateParams::CreateForApp(
         Browser::TYPE_POPUP,
         std::string("Test"),
         gfx::Rect(),
         browser()->profile(),
         browser()->host_desktop_type());
     params.initial_show_state = ui::SHOW_STATE_MAXIMIZED;
     params.app_type = Browser::APP_TYPE_HOST;
@@ skipping 22 matching lines @@
   Browser* app_browser() const { return app_browser_; }
 
  private:
   Browser *app_browser_;
 };
 
 #if defined(USE_ASH)
 // Ensure that restoring the app window replaces the frame with a normal one,
 // and maximizing again brings back the app frame. This has been the source of
 // some crash bugs like crbug.com/155634
-IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAshTest, SwitchFrames) {
+IN_PROC_BROWSER_TEST_F(AppBrowserFrameViewAshTest, SwitchFrames) {
   // Convert to std::string so Windows can match EXPECT_EQ.
   const std::string kAppFrameClassName =
-      AppNonClientFrameViewAsh::kViewClassName;
+      AppBrowserFrameViewAsh::kViewClassName;
   const std::string kNormalFrameClassName =
       BrowserNonClientFrameViewAsh::kViewClassName;
 
   // We start with the app frame.
   EXPECT_EQ(kAppFrameClassName, GetFrameClassName());
 
   // Restoring the window gives us the normal frame.
   Window* native_window = app_browser()->window()->GetNativeWindow();
   RestoreWindow(native_window);
   EXPECT_EQ(kNormalFrameClassName, GetFrameClassName());
@@ skipping 15 matching lines @@
   // One more restore/maximize cycle for good measure.
   RestoreWindow(native_window);
   EXPECT_EQ(kNormalFrameClassName, GetFrameClassName());
   MaximizeWindow(native_window);
   EXPECT_EQ(kAppFrameClassName, GetFrameClassName());
 }
 #endif  // USE_ASH
 
 // Ensure that we can click the close button when the controls are shown.
 // In particular make sure that we can click it on the top pixel of the button.
-IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAshTest, ClickClose) {
+IN_PROC_BROWSER_TEST_F(AppBrowserFrameViewAshTest, ClickClose) {
   aura::RootWindow* root_window = GetRootWindow();
   aura::test::EventGenerator eg(root_window, gfx::Point(0, 1));
 
   // Click close button.
   eg.MoveMouseTo(root_window->bounds().width() - 1, 0);
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(app_browser()));
   eg.ClickLeftButton();
   signal.Wait();
   EXPECT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
-                                      browser()->host_desktop_type()));
+                                        browser()->host_desktop_type()));
 }
 
 // Ensure that closing a maximized app with Ctrl-W does not crash the
 // application.  crbug.com/147635
-IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAshTest, KeyboardClose) {
+IN_PROC_BROWSER_TEST_F(AppBrowserFrameViewAshTest, KeyboardClose) {
   aura::RootWindow* root_window = GetRootWindow();
   aura::test::EventGenerator eg(root_window);
 
   // Base browser and app browser.
   EXPECT_EQ(2u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
 
   // Send Control-W.
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(app_browser()));
   eg.PressKey(ui::VKEY_W, ui::EF_CONTROL_DOWN);
   eg.ReleaseKey(ui::VKEY_W, ui::EF_CONTROL_DOWN);
   signal.Wait();
 
   // App browser is closed.
   EXPECT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
 }
 
 // Ensure that snapping left with Alt-[ closes the control window.
-IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAshTest, SnapLeftClosesControls) {
+IN_PROC_BROWSER_TEST_F(AppBrowserFrameViewAshTest, SnapLeftClosesControls) {
+  const char* kControlWindowName =
+      ash::HideableCaptionButtonContainer::kButtonWindowName;
+
   aura::RootWindow* root_window = GetRootWindow();
   aura::test::EventGenerator eg(root_window);
   aura::Window* native_window = app_browser()->window()->GetNativeWindow();
 
   // Control window exists.
-  EXPECT_TRUE(HasChildWindowNamed(
-      native_window, AppNonClientFrameViewAsh::kControlWindowName));
+  EXPECT_TRUE(HasChildWindowNamed(native_window, kControlWindowName));
 
   // Send Alt-[
   eg.PressKey(ui::VKEY_OEM_4, ui::EF_ALT_DOWN);
   eg.ReleaseKey(ui::VKEY_OEM_4, ui::EF_ALT_DOWN);
   content::RunAllPendingInMessageLoop();
 
   // Control window is gone.
-  EXPECT_FALSE(HasChildWindowNamed(
-      native_window, AppNonClientFrameViewAsh::kControlWindowName));
+  EXPECT_FALSE(HasChildWindowNamed(native_window, kControlWindowName));
 }
 
 // Ensure that the controls are at the proper locations.
-IN_PROC_BROWSER_TEST_F(AppNonClientFrameViewAshTest, ControlsAtRightSide) {
+IN_PROC_BROWSER_TEST_F(AppBrowserFrameViewAshTest, ControlsAtRightSide) {
+  const char* kControlWindowName =
+      ash::HideableCaptionButtonContainer::kButtonWindowName;
+
   aura::RootWindow* root_window = GetRootWindow();
   aura::test::EventGenerator eg(root_window);
   aura::Window* native_window = app_browser()->window()->GetNativeWindow();
   const gfx::Rect work_area =
       gfx::Screen::GetScreenFor(native_window)->GetPrimaryDisplay().work_area();
 
   // Control window exists.
-  aura::Window* window = GetChildWindowNamed(
-      native_window, AppNonClientFrameViewAsh::kControlWindowName);
+  aura::Window* window = GetChildWindowNamed(native_window, kControlWindowName);
 
   ASSERT_TRUE(window);
   gfx::Rect rect = window->bounds();
   EXPECT_EQ(work_area.right(), rect.right());
   EXPECT_EQ(work_area.y(), rect.y());
 
   MinimizeWindow(native_window);
   content::RunAllPendingInMessageLoop();
-  window = GetChildWindowNamed(
-      native_window, AppNonClientFrameViewAsh::kControlWindowName);
+  window = GetChildWindowNamed(native_window, kControlWindowName);
   EXPECT_FALSE(window);
   MaximizeWindow(native_window);
   content::RunAllPendingInMessageLoop();
 
   // Control window exists.
   aura::Window* window_after = GetChildWindowNamed(
-      native_window, AppNonClientFrameViewAsh::kControlWindowName);
+      native_window, kControlWindowName);
   ASSERT_TRUE(window_after);
   gfx::Rect rect_after = window_after->bounds();
   EXPECT_EQ(work_area.right(), rect_after.right());
   EXPECT_EQ(work_area.y(), rect_after.y());
 }