chrome/browser/chromeos/sms_observer.cc - Issue 11039034: Move ash/system/network to ash/system/chromeos

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/sms_observer.cc

Issue 11039034: Move ash/system/network to ash/system/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 2 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 | « chrome/browser/chromeos/network_message_observer.cc ('k') | chrome/browser/chromeos/status/data_promo_notification.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/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/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 "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

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

12 #include "grit/generated_resources.h"	12 #include "grit/generated_resources.h"

13 #include "grit/theme_resources.h"	13 #include "grit/theme_resources.h"

14 #include "ui/base/l10n/l10n_util.h"	14 #include "ui/base/l10n/l10n_util.h"

15	15

16 namespace chromeos {	16 namespace chromeos {

17	17

18 SmsObserver::SmsObserver(Profile* profile)	18 SmsObserver::SmsObserver(Profile* profile)

(...skipping 89 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108	108

109 // Add an Ash SMS notification. TODO(stevenjb): Replace this code with	109 // Add an Ash SMS notification. TODO(stevenjb): Replace this code with

110 // NetworkSmsHandler when fixed: crbug.com/133416.	110 // NetworkSmsHandler when fixed: crbug.com/133416.

111 base::DictionaryValue dict;	111 base::DictionaryValue dict;

112 dict.SetString(ash::kSmsNumberKey, message.number);	112 dict.SetString(ash::kSmsNumberKey, message.number);

113 dict.SetString(ash::kSmsTextKey, message.text);	113 dict.SetString(ash::kSmsTextKey, message.text);

114 ash::Shell::GetInstance()->system_tray()->sms_observer()->AddMessage(dict);	114 ash::Shell::GetInstance()->system_tray()->sms_observer()->AddMessage(dict);

115 }	115 }

116	116

117 } // namespace chromeos	117 } // namespace chromeos

OLD	NEW