chrome/browser/chromeos/status/data_promo_notification.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/status/data_promo_notification.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/sms_observer.cc ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.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/status/data_promo_notification.h"	5 #include "chrome/browser/chromeos/status/data_promo_notification.h"

6	6

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

8 #include "ash/shell_window_ids.h"	8 #include "ash/shell_window_ids.h"

9 #include "ash/system/network/network_observer.h"	9 #include "ash/system/chromeos/network/network_observer.h"

10 #include "ash/system/tray/system_tray.h"	10 #include "ash/system/tray/system_tray.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

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

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

15 #include "chrome/browser/chromeos/login/helper.h"	15 #include "chrome/browser/chromeos/login/helper.h"

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

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

18 #include "chrome/browser/prefs/pref_service.h"	18 #include "chrome/browser/prefs/pref_service.h"

19 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

(...skipping 196 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
216 }	216 }

217	217

218 void DataPromoNotification::CloseNotification() {	218 void DataPromoNotification::CloseNotification() {

219 if (ash::Shell::GetInstance()->system_tray()->network_observer()) {	219 if (ash::Shell::GetInstance()->system_tray()->network_observer()) {

220 ash::Shell::GetInstance()->system_tray()->network_observer()->	220 ash::Shell::GetInstance()->system_tray()->network_observer()->

221 ClearNetworkMessage(ash::NetworkObserver::MESSAGE_DATA_PROMO);	221 ClearNetworkMessage(ash::NetworkObserver::MESSAGE_DATA_PROMO);

222 }	222 }

223 }	223 }

224	224

225 } // namespace chromeos	225 } // namespace chromeos

OLD	NEW