ash/shell/window_type_launcher.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

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/shell/window_type_launcher.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 2 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/shell/window_type_launcher.cc

diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc

index fa9a7e495ef662d5d2e704d978faa526f4c9803e..df45d896f57049325e930870928451e145f2a53b 100644

--- a/ash/shell/window_type_launcher.cc

+++ b/ash/shell/window_type_launcher.cc

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

#include "ash/shell/window_type_launcher.h"

+#include "ash/root_window_controller.h"

#include "ash/screensaver/screensaver_view.h"

#include "ash/shell.h"

#include "ash/shell/example_factory.h"

@@ -327,7 +328,7 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender,

base::TimeDelta::FromSeconds(5));

} else if (sender == show_web_notification_) {

- ash::Shell::GetInstance()->status_area_widget()->

+ ash::Shell::GetPrimaryRootWindowController()->status_area_widget()->

web_notification_tray()->AddNotification(

"id0",

ASCIIToUTF16("Test Shell Web Notification"),

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