Show overview mode button in TouchView with open modal window

ash/wm/dock/docked_window_resizer_unittest.cc

 // Copyright (c) 2013 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/dock/docked_window_resizer.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
@@ skipping 69 matching lines @@
       test::TestShelfDelegate* shelf_delegate =
           test::TestShelfDelegate::instance();
       shelf_delegate->AddShelfItem(window);
       PanelLayoutManager* manager = static_cast<PanelLayoutManager*>(
           Shell::GetContainer(window->GetRootWindow(),
                               kShellWindowId_PanelContainer)->layout_manager());
       manager->Relayout();
     }
     return window;
   }
-
   aura::Window* CreateModalWindow(const gfx::Rect& bounds) {
-    aura::Window* window = new aura::Window(&delegate_);
-    window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
-    window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-    window->Init(ui::LAYER_TEXTURED);
-    window->Show();
-
-    if (bounds.IsEmpty()) {
-      ParentWindowInPrimaryRootWindow(window);
-    } else {
-      gfx::Display display =
-          Shell::GetScreen()->GetDisplayMatching(bounds);
-      aura::Window* root = ash::Shell::GetInstance()->display_controller()->
-          GetRootWindowForDisplayId(display.id());
-      gfx::Point origin = bounds.origin();
-      ::wm::ConvertPointFromScreen(root, &origin);
-      window->SetBounds(gfx::Rect(origin, bounds.size()));
-      aura::client::ParentWindowWithContext(window, root, bounds);
-    }
-    return window;
+    return CreateTestModalWindowInShellWithDelegateAndType(
+        &delegate_, ui::wm::WINDOW_TYPE_NORMAL, 0, bounds);

[jonross, 2015/05/01 17:30:15]

Awesome!

   }
 
   static WindowResizer* CreateSomeWindowResizer(
       aura::Window* window,
       const gfx::Point& point_in_parent,
       int window_component) {
     return CreateWindowResizer(
         window,
         point_in_parent,
         window_component,
@@ skipping 1481 matching lines @@
   EXPECT_TRUE(window_state->IsMaximized());
 }
 
 // Tests run twice - on both panels and normal windows
 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
                         DockedWindowResizerTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL));
 
 }  // namespace ash