ash/wm/panel_layout_manager.cc - Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/panel_layout_manager.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/wm/panel_layout_manager.cc

diff --git a/ash/wm/panel_layout_manager.cc b/ash/wm/panel_layout_manager.cc

index a1d1154126dd2b45adedd9fe08ebd27589614af8..396d0b5640de065436cf2dc6218e0bee3630e43b 100644

--- a/ash/wm/panel_layout_manager.cc

+++ b/ash/wm/panel_layout_manager.cc

@@ -91,13 +91,13 @@ PanelLayoutManager::PanelLayoutManager(aura::Window* panel_container)

views::View* content_view = new views::View;

content_view->set_background(new CalloutWidgetBackground);

callout_widget_->SetContentsView(content_view);

- Shell::GetRootWindow()->AddObserver(this);

+ Shell::GetPrimaryRootWindow()->AddObserver(this);

}

PanelLayoutManager::~PanelLayoutManager() {

if (launcher_)

launcher_->RemoveIconObserver(this);

- Shell::GetRootWindow()->RemoveObserver(this);

+ Shell::GetPrimaryRootWindow()->RemoveObserver(this);

}

void PanelLayoutManager::StartDragging(aura::Window* panel) {

« no previous file with comments | « ash/wm/base_layout_manager_unittest.cc ('k') | ash/wm/partial_screenshot_view.cc » ('j') | no next file with comments »