ash/system/status_area_widget.cc - Issue 10546024: Add RootWindowController

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/system/status_area_widget.cc

Issue 10546024: Add RootWindowController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 6 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/system/status_area_widget.cc

diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc

index f0ae1d011962800493d8f33a8df2a7e57476aafe..9c0a3125414da925e3255b827ee2e0d654daa638 100644

--- a/ash/system/status_area_widget.cc

+++ b/ash/system/status_area_widget.cc

@@ -4,6 +4,7 @@

#include "ash/system/status_area_widget.h"

+#include "ash/root_window_controller.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "ash/shell_window_ids.h"

@@ -285,9 +286,9 @@ StatusAreaWidget::StatusAreaWidget()

views::Widget::InitParams params(

views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);

params.delegate = widget_delegate_;

- params.parent = Shell::GetContainer(

- Shell::GetPrimaryRootWindow(),

- ash::internal::kShellWindowId_StatusContainer);

+ params.parent =

+ Shell::GetPrimaryRootWindowController()->GetContainer(

+ ash::internal::kShellWindowId_StatusContainer);

params.transparent = true;

Init(params);

set_focus_on_creation(false);

« no previous file with comments | « ash/shell.cc ('k') | ash/tooltips/tooltip_controller.cc » ('j') | no next file with comments »