Show overview mode button in TouchView with open modal window

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 266 matching lines @@
     gfx::Point origin = bounds.origin();
     ::wm::ConvertPointFromScreen(root, &origin);
     window->SetBounds(gfx::Rect(origin, bounds.size()));
     aura::client::ParentWindowWithContext(window, root, bounds);
   }
   window->SetProperty(aura::client::kCanMaximizeKey, true);
   window->SetProperty(aura::client::kCanMinimizeKey, true);
   return window;
 }
 
+aura::Window* AshTestBase::CreateTestModalWindowInShellWithBounds(
+    const gfx::Rect& bounds) {
+  return CreateTestModalWindowInShellWithDelegateAndType(
+      nullptr, ui::wm::WINDOW_TYPE_NORMAL, 0, bounds);
+}
+
+aura::Window* AshTestBase::CreateTestModalWindowInShellWithDelegateAndType(

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

Can you call CreateTestWindowInShellWithDelegateAndType and then apply the modal
property afterwards?

If not, can you also add the refactoring TODO here to help explain the duplicate
code?

[tdanderson, 2015/05/01 18:07:32]

I tried that but it doesn't work. The system modal property must be set on the
window prior to giving the window a parent, otherwise it will not end up as a
descendant of the modal container. I will add a comment.

[jonross, 2015/05/01 18:29:53]

Acknowledged.

+    aura::WindowDelegate* delegate,
+    ui::wm::WindowType type,
+    int id,
+    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;
+}
+
 void AshTestBase::ParentWindowInPrimaryRootWindow(aura::Window* window) {
   aura::client::ParentWindowWithContext(
       window, Shell::GetPrimaryRootWindow(), gfx::Rect());
 }
 
 void AshTestBase::RunAllPendingInMessageLoop() {
   ash_test_helper_->RunAllPendingInMessageLoop();
 }
 
 TestScreenshotDelegate* AshTestBase::GetScreenshotDelegate() {
@@ skipping 59 matching lines @@
 
 void AshTestBase::UnblockUserSession() {
   Shell::GetInstance()->session_state_delegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 
 }  // namespace test
 }  // namespace ash