summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/ash_focus_rules.cc2
-rw-r--r--ash/wm/drag_window_resizer_unittest.cc4
-rw-r--r--ash/wm/frame_painter_unittest.cc2
-rw-r--r--ash/wm/maximize_bubble_controller.cc2
-rw-r--r--ash/wm/mru_window_tracker.cc2
-rw-r--r--ash/wm/overview/window_selector.cc4
-rw-r--r--ash/wm/overview/window_selector_unittest.cc2
-rw-r--r--ash/wm/stacking_controller.cc2
-rw-r--r--ash/wm/window_cycle_controller_unittest.cc6
-rw-r--r--ash/wm/workspace/multi_window_resize_controller.cc2
10 files changed, 14 insertions, 14 deletions
diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
index 0b5aa33..851dbba 100644
--- a/ash/wm/ash_focus_rules.cc
+++ b/ash/wm/ash_focus_rules.cc
@@ -107,7 +107,7 @@ aura::Window* AshFocusRules::GetNextActivatableWindow(
// container.
aura::RootWindow* root = ignore->GetRootWindow();
if (!root)
- root = Shell::GetActiveRootWindow();
+ root = Shell::GetTargetRootWindow();
int container_count = static_cast<int>(arraysize(kWindowContainerIds));
for (int i = 0; ignore && i < container_count; i++) {
aura::Window* container = Shell::GetContainer(root, kWindowContainerIds[i]);
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
index 2e8648f..81aec45 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -224,7 +224,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
EXPECT_TRUE(ash::wm::CanActivateWindow(window.get()));
ash::wm::ActivateWindow(window.get());
EXPECT_EQ(root_windows[0], window->GetRootWindow());
- EXPECT_EQ(root_windows[0], ash::Shell::GetActiveRootWindow());
+ EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
{
// Grab (0, 0) of the window.
scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
@@ -237,7 +237,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
// The whole window is on the secondary display now. The parent should be
// changed.
EXPECT_EQ(root_windows[1], window->GetRootWindow());
- EXPECT_EQ(root_windows[1], ash::Shell::GetActiveRootWindow());
+ EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
}
}
diff --git a/ash/wm/frame_painter_unittest.cc b/ash/wm/frame_painter_unittest.cc
index 1bc6923..7790339 100644
--- a/ash/wm/frame_painter_unittest.cc
+++ b/ash/wm/frame_painter_unittest.cc
@@ -208,7 +208,7 @@ class FramePainterTest : public ash::test::AshTestBase {
TEST_F(FramePainterTest, CreateAndDeleteSingleWindow) {
// Ensure that creating/deleting a window works well and doesn't cause
// crashes. See crbug.com/155634
- aura::RootWindow* root = Shell::GetActiveRootWindow();
+ aura::RootWindow* root = Shell::GetTargetRootWindow();
scoped_ptr<Widget> widget(CreateTestWidget());
scoped_ptr<FramePainter> painter(CreateTestPainter(widget.get()));
diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc
index ae108ca..68cbfd9 100644
--- a/ash/wm/maximize_bubble_controller.cc
+++ b/ash/wm/maximize_bubble_controller.cc
@@ -390,7 +390,7 @@ MaximizeBubbleController::Bubble::Bubble(
// The window needs to be owned by the root so that the SnapSizer does not
// cover it upon animation.
aura::Window* parent = Shell::GetContainer(
- Shell::GetActiveRootWindow(),
+ Shell::GetTargetRootWindow(),
internal::kShellWindowId_ShelfContainer);
set_parent_window(parent);
diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc
index 8c90efb..869f8b5 100644
--- a/ash/wm/mru_window_tracker.cc
+++ b/ash/wm/mru_window_tracker.cc
@@ -41,7 +41,7 @@ MruWindowTracker::WindowList BuildWindowListInternal(
MruWindowTracker::WindowList windows;
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
- aura::RootWindow* active_root = Shell::GetActiveRootWindow();
+ aura::RootWindow* active_root = Shell::GetTargetRootWindow();
for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter) {
if (*iter == active_root)
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index 847740c..a741afd 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -236,14 +236,14 @@ void WindowSelector::OnAttemptToReactivateWindow(aura::Window* request_active,
void WindowSelector::StartOverview() {
DCHECK(!window_overview_);
window_overview_.reset(new WindowOverview(this, &windows_,
- mode_ == CYCLE ? Shell::GetActiveRootWindow() : NULL));
+ mode_ == CYCLE ? Shell::GetTargetRootWindow() : NULL));
if (mode_ == CYCLE)
window_overview_->SetSelection(selected_window_);
}
void WindowSelector::RemoveFocusAndSetRestoreWindow() {
aura::client::FocusClient* focus_client = aura::client::GetFocusClient(
- Shell::GetActiveRootWindow());
+ Shell::GetPrimaryRootWindow());
DCHECK(!restore_focus_window_);
restore_focus_window_ = focus_client->GetFocusedWindow();
if (restore_focus_window_) {
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 3210259..2142f9a 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -92,7 +92,7 @@ class WindowSelectorTest : public test::AshTestBase {
aura::Window* GetFocusedWindow() {
return aura::client::GetFocusClient(
- Shell::GetActiveRootWindow())->GetFocusedWindow();
+ Shell::GetPrimaryRootWindow())->GetFocusedWindow();
}
private:
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 51e13b3..d846c78 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -25,7 +25,7 @@ namespace {
// return the active root window.
aura::RootWindow* FindContainerRoot(const gfx::Rect& bounds) {
if (bounds.x() == 0 && bounds.y() == 0 && bounds.IsEmpty())
- return Shell::GetActiveRootWindow();
+ return Shell::GetTargetRootWindow();
return wm::GetRootWindowMatching(bounds);
}
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc
index 8e74543..7cb4bbc 100644
--- a/ash/wm/window_cycle_controller_unittest.cc
+++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -328,7 +328,7 @@ TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
WindowCycleController* controller =
Shell::GetInstance()->window_cycle_controller();
- Shell::GetInstance()->set_active_root_window(root_windows[0]);
+ Shell::GetInstance()->set_target_root_window(root_windows[0]);
// Create two windows in the primary root.
scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
@@ -341,7 +341,7 @@ TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
EXPECT_EQ(root_windows[0], window1->GetRootWindow());
// And two on the secondary root.
- Shell::GetInstance()->set_active_root_window(root_windows[1]);
+ Shell::GetInstance()->set_target_root_window(root_windows[1]);
scoped_ptr<Window> window2(CreateTestWindowInShellWithId(2));
EXPECT_EQ(root_windows[1], window2->GetRootWindow());
@@ -353,7 +353,7 @@ TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
EXPECT_EQ(root_windows[1], window3->GetRootWindow());
// Move the active root window to the secondary.
- Shell::GetInstance()->set_active_root_window(root_windows[1]);
+ Shell::GetInstance()->set_target_root_window(root_windows[1]);
wm::ActivateWindow(window2.get());
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index c447b9c..597acbf 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -387,7 +387,7 @@ void MultiWindowResizeController::ShowNow() {
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.parent = Shell::GetContainer(
- Shell::GetActiveRootWindow(),
+ Shell::GetTargetRootWindow(),
internal::kShellWindowId_AlwaysOnTopContainer);
params.can_activate = false;
ResizeView* view = new ResizeView(this, windows_.direction);
generated by cgit v1.1 at 2025-02-04 00:39:13 +0000