chrome/browser/chromeos/profile_startup.cc - Issue 10582028: Re-factor TraySms to use ash::SmsObserver instead of NetoworkSmsHandler.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | chrome/browser/chromeos/sms_observer.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/chromeos/profile_startup.h"	5 #include "chrome/browser/chromeos/profile_startup.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "chrome/browser/chromeos/cros/cros_library.h"	9 #include "chrome/browser/chromeos/cros/cros_library.h"

10 #include "chrome/browser/chromeos/cros/network_library.h"	10 #include "chrome/browser/chromeos/cros/network_library.h"

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
43	43

44 static chromeos::NetworkMessageObserver* network_message_observer =	44 static chromeos::NetworkMessageObserver* network_message_observer =

45 new chromeos::NetworkMessageObserver(profile);	45 new chromeos::NetworkMessageObserver(profile);

46 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->	46 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->

47 AddNetworkManagerObserver(network_message_observer);	47 AddNetworkManagerObserver(network_message_observer);

48 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->	48 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->

49 AddCellularDataPlanObserver(network_message_observer);	49 AddCellularDataPlanObserver(network_message_observer);

50 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->	50 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->

51 AddUserActionObserver(network_message_observer);	51 AddUserActionObserver(network_message_observer);

52	52

53 if (CommandLine::ForCurrentProcess()->HasSwitch(	53 static chromeos::SmsObserver* sms_observer =

54 ash::switches::kAshNotifyDisabled)) {	54 new chromeos::SmsObserver(profile);

55 static chromeos::SmsObserver* sms_observer =	55 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->

56 new chromeos::SmsObserver(profile);	56 AddNetworkManagerObserver(sms_observer);

57 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->

58 AddNetworkManagerObserver(sms_observer);

59 }

60	57

61 profile->SetupChromeOSEnterpriseExtensionObserver();	58 profile->SetupChromeOSEnterpriseExtensionObserver();

62 }	59 }

63 }	60 }

64	61

65 } // namespace chromeos	62 } // namespace chromeos

OLD	NEW