chrome/browser/chromeos/system/ash_system_tray_delegate.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: chrome/browser/chromeos/system/ash_system_tray_delegate.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index 287ccca873a8c28101eafc4e518746f93084ec92..be01d4ca8345fbed6a688c426e3c3d2985870705 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -14,7 +14,6 @@

#include "ash/system/ime/ime_observer.h"

#include "ash/system/network/network_observer.h"

#include "ash/system/power/power_status_observer.h"

-#include "ash/system/status_area_widget.h"

#include "ash/system/tray/system_tray.h"

#include "ash/system/tray/system_tray_delegate.h"

#include "ash/system/tray_accessibility.h"

@@ -944,14 +943,14 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

// Overridden from SessionManagerClient::Observer.

virtual void LockScreen() OVERRIDE {

screen_locked_ = true;

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

- UpdateAfterLoginStatusChange(GetUserLoginStatus());

+ ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(

+ GetUserLoginStatus());

}

virtual void UnlockScreen() OVERRIDE {

screen_locked_ = false;

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

- UpdateAfterLoginStatusChange(GetUserLoginStatus());

+ ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(

+ GetUserLoginStatus());

}

// TODO(sad): Override more from PowerManagerClient::Observer here (e.g.

@@ -1075,8 +1074,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

break;

}

case chrome::NOTIFICATION_SESSION_STARTED: {

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

- UpdateAfterLoginStatusChange(GetUserLoginStatus());

+ ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(

+ GetUserLoginStatus());

SetProfile(ProfileManager::GetDefaultProfile());

break;

}