ash/wm/partial_screenshot_view.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/partial_screenshot_view.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/partial_screenshot_view.cc

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

index ce5a68f9ad5739a8298ec930747d4cec1b21700c..3e492e2bfe5b6e97a45188e57ff1212d2a3bd0cd 100644

--- a/ash/wm/partial_screenshot_view.cc

+++ b/ash/wm/partial_screenshot_view.cc

@@ -53,7 +53,7 @@ void PartialScreenshotView::StartPartialScreenshot(

widget->Init(params);

widget->SetContentsView(view);

- widget->SetBounds(Shell::GetRootWindow()->bounds());

+ widget->SetBounds(Shell::GetPrimaryRootWindow()->bounds());

widget->GetNativeView()->SetName("PartialScreenshotView");

widget->StackAtTop();

widget->Show();

@@ -117,7 +117,7 @@ void PartialScreenshotView::OnMouseReleased(const views::MouseEvent& event) {

is_dragging_ = false;

if (screenshot_delegate_) {

- aura::RootWindow *root_window = Shell::GetRootWindow();

+ aura::RootWindow *root_window = Shell::GetPrimaryRootWindow();

screenshot_delegate_->HandleTakePartialScreenshot(

root_window, root_window->bounds().Intersect(GetScreenshotRect()));

}

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