chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 14200033: [cros] Rename BaseLoginDisplayHost to LoginDisplayHostImpl

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 14200033: [cros] Rename BaseLoginDisplayHost to LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 7 years, 8 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: 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 d2b3d7d5d1974672970c74678dec88847980520f..07ab3ac87fc9e22cb40f842079279037ca1cac2b 100644

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

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

@@ -54,9 +54,9 @@

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

#include "chrome/browser/chromeos/input_method/input_method_util.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

-#include "chrome/browser/chromeos/login/base_login_display_host.h"

#include "chrome/browser/chromeos/login/help_app_launcher.h"

#include "chrome/browser/chromeos/login/login_display_host.h"

+#include "chrome/browser/chromeos/login/login_display_host_impl.h"

#include "chrome/browser/chromeos/login/login_wizard.h"

#include "chrome/browser/chromeos/login/user.h"

#include "chrome/browser/chromeos/login/user_manager.h"

@@ -957,7 +957,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

virtual void ChangeProxySettings() OVERRIDE {

CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);

- BaseLoginDisplayHost::default_host()->OpenProxySettings();

+ LoginDisplayHostImpl::default_host()->OpenProxySettings();

}

virtual ash::VolumeControlDelegate*