Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2360)

Unified Diff: chrome/browser/chromeos/profile_startup.cc

Issue 10582028: Re-factor TraySms to use ash::SmsObserver instead of NetoworkSmsHandler. (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | chrome/browser/chromeos/sms_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/profile_startup.cc
diff --git a/chrome/browser/chromeos/profile_startup.cc b/chrome/browser/chromeos/profile_startup.cc
index 5412f633e113d54f4a091db578d57e09268a32c6..ebe9103edd9bd02b892f87590d8eb661a24e3143 100644
--- a/chrome/browser/chromeos/profile_startup.cc
+++ b/chrome/browser/chromeos/profile_startup.cc
@@ -50,13 +50,10 @@ void ProfileStartup(Profile* profile, bool process_startup) {
chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
AddUserActionObserver(network_message_observer);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kAshNotifyDisabled)) {
- static chromeos::SmsObserver* sms_observer =
- new chromeos::SmsObserver(profile);
- chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
- AddNetworkManagerObserver(sms_observer);
- }
+ static chromeos::SmsObserver* sms_observer =
+ new chromeos::SmsObserver(profile);
+ chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
+ AddNetworkManagerObserver(sms_observer);
profile->SetupChromeOSEnterpriseExtensionObserver();
}
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | chrome/browser/chromeos/sms_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698