chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 14362031: Move part of WizardController static code to StartupUtils

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 14362031: Move part of WizardController static code to StartupUtils (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fighting with whitespaces again 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 a7a663616b1985315e064239e2bf8cfecea5e64e..b869cb1c355443fda33aabf2b312b04ce9746871 100644

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

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

@@ -58,9 +58,9 @@

#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/startup_utils.h"

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

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

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

#include "chrome/browser/chromeos/mobile_config.h"

#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"

#include "chrome/browser/chromeos/status/data_promo_notification.h"

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

}

virtual bool IsOobeCompleted() const OVERRIDE {

- return WizardController::IsOobeCompleted();

+ return StartupUtils::IsOobeCompleted();

}

virtual void GetLoggedInUsers(ash::UserEmailList* users) OVERRIDE {