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

Side by Side Diff: trunk/src/chrome/browser/chromeos/sms_observer.cc

Issue 14066013: Revert 194348 "Part of multiprofile implementation." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/sms_observer.h" 5 #include "chrome/browser/chromeos/sms_observer.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/chromeos/network/sms_observer.h" 8 #include "ash/system/chromeos/network/sms_observer.h"
9 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
10 #include "ash/system/tray/system_tray_notifier.h" 10 #include "ash/system/tray/system_tray_notifier.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/chromeos/cros/cros_library.h" 12 #include "chrome/browser/chromeos/cros/cros_library.h"
13 #include "chromeos/network/cros_network_functions.h" 13 #include "chromeos/network/cros_network_functions.h"
14 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
15 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 17
18 namespace chromeos { 18 namespace chromeos {
19 19
20 SmsObserver::SmsObserver() { 20 SmsObserver::SmsObserver(Profile* profile)
21 : profile_(profile) {
22 DCHECK(profile_);
21 UpdateObservers(chromeos::CrosLibrary::Get()->GetNetworkLibrary()); 23 UpdateObservers(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
22 } 24 }
23 25
24 SmsObserver::~SmsObserver() { 26 SmsObserver::~SmsObserver() {
25 NetworkLibrary* library = chromeos::CrosLibrary::Get()->GetNetworkLibrary(); 27 NetworkLibrary* library = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
26 library->RemoveNetworkManagerObserver(this); 28 library->RemoveNetworkManagerObserver(this);
27 DisconnectAll(); 29 DisconnectAll();
28 } 30 }
29 31
30 void SmsObserver::UpdateObservers(NetworkLibrary* library) { 32 void SmsObserver::UpdateObservers(NetworkLibrary* library) {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 110
109 // Add an Ash SMS notification. TODO(stevenjb): Replace this code with 111 // Add an Ash SMS notification. TODO(stevenjb): Replace this code with
110 // NetworkSmsHandler when fixed: crbug.com/133416. 112 // NetworkSmsHandler when fixed: crbug.com/133416.
111 base::DictionaryValue dict; 113 base::DictionaryValue dict;
112 dict.SetString(ash::kSmsNumberKey, message.number); 114 dict.SetString(ash::kSmsNumberKey, message.number);
113 dict.SetString(ash::kSmsTextKey, message.text); 115 dict.SetString(ash::kSmsTextKey, message.text);
114 ash::Shell::GetInstance()->system_tray_notifier()->NotifyAddSmsMessage(dict); 116 ash::Shell::GetInstance()->system_tray_notifier()->NotifyAddSmsMessage(dict);
115 } 117 }
116 118
117 } // namespace chromeos 119 } // namespace chromeos
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/chromeos/sms_observer.h ('k') | trunk/src/chrome/browser/ui/startup/startup_browser_creator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698