Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: ash/root_window_controller.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix MRUWindowTracker and MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "ui/aura/window_observer.h" 57 #include "ui/aura/window_observer.h"
58 #include "ui/aura/window_tracker.h" 58 #include "ui/aura/window_tracker.h"
59 #include "ui/base/hit_test.h" 59 #include "ui/base/hit_test.h"
60 #include "ui/base/models/menu_model.h" 60 #include "ui/base/models/menu_model.h"
61 #include "ui/gfx/display.h" 61 #include "ui/gfx/display.h"
62 #include "ui/gfx/screen.h" 62 #include "ui/gfx/screen.h"
63 #include "ui/keyboard/keyboard_controller.h" 63 #include "ui/keyboard/keyboard_controller.h"
64 #include "ui/keyboard/keyboard_util.h" 64 #include "ui/keyboard/keyboard_util.h"
65 #include "ui/views/controls/menu/menu_runner.h" 65 #include "ui/views/controls/menu/menu_runner.h"
66 #include "ui/views/corewm/capture_controller.h" 66 #include "ui/views/corewm/capture_controller.h"
67 #include "ui/views/corewm/transient_window_manager.h"
67 #include "ui/views/corewm/visibility_controller.h" 68 #include "ui/views/corewm/visibility_controller.h"
68 #include "ui/views/view_model.h" 69 #include "ui/views/view_model.h"
69 #include "ui/views/view_model_utils.h" 70 #include "ui/views/view_model_utils.h"
70 71
71 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
72 #include "ash/wm/boot_splash_screen_chromeos.h" 73 #include "ash/wm/boot_splash_screen_chromeos.h"
73 #endif 74 #endif
74 75
75 namespace ash { 76 namespace ash {
76 namespace { 77 namespace {
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 if (((*iter)->type() == aura::client::WINDOW_TYPE_NORMAL || 538 if (((*iter)->type() == aura::client::WINDOW_TYPE_NORMAL ||
538 (*iter)->type() == aura::client::WINDOW_TYPE_PANEL) && 539 (*iter)->type() == aura::client::WINDOW_TYPE_PANEL) &&
539 (*iter)->layer()->GetTargetVisibility()) { 540 (*iter)->layer()->GetTargetVisibility()) {
540 topmost_window = *iter; 541 topmost_window = *iter;
541 break; 542 break;
542 } 543 }
543 } 544 }
544 while (topmost_window) { 545 while (topmost_window) {
545 if (wm::GetWindowState(topmost_window)->IsFullscreen()) 546 if (wm::GetWindowState(topmost_window)->IsFullscreen())
546 return topmost_window; 547 return topmost_window;
547 topmost_window = topmost_window->transient_parent(); 548 topmost_window = views::corewm::GetTransientParent(topmost_window);
548 } 549 }
549 return NULL; 550 return NULL;
550 } 551 }
551 552
552 void RootWindowController::ActivateKeyboard( 553 void RootWindowController::ActivateKeyboard(
553 keyboard::KeyboardController* keyboard_controller) { 554 keyboard::KeyboardController* keyboard_controller) {
554 if (!keyboard::IsKeyboardEnabled() || 555 if (!keyboard::IsKeyboardEnabled() ||
555 GetContainer(kShellWindowId_VirtualKeyboardContainer)) { 556 GetContainer(kShellWindowId_VirtualKeyboardContainer)) {
556 return; 557 return;
557 } 558 }
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 DisableTouchHudProjection(); 944 DisableTouchHudProjection();
944 } 945 }
945 946
946 RootWindowController* GetRootWindowController( 947 RootWindowController* GetRootWindowController(
947 const aura::Window* root_window) { 948 const aura::Window* root_window) {
948 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 949 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
949 } 950 }
950 951
951 } // namespace internal 952 } // namespace internal
952 } // namespace ash 953 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698