chrome/browser/chromeos/network_message_observer.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/chromeos/network_message_observer.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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

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/network_message_observer.h"	5 #include "chrome/browser/chromeos/network_message_observer.h"

6	6

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

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

9 #include "ash/system/chromeos/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 "ash/system/tray/system_tray_notifier.h"	11 #include "ash/system/tray/system_tray_notifier.h"

12 #include "base/bind.h"	12 #include "base/bind.h"

13 #include "base/callback.h"	13 #include "base/callback.h"

	14 #include "base/prefs/pref_service.h"

14 #include "base/stl_util.h"	15 #include "base/stl_util.h"

15 #include "base/string_number_conversions.h"	16 #include "base/string_number_conversions.h"

16 #include "base/utf_string_conversions.h"	17 #include "base/utf_string_conversions.h"

17 #include "chrome/browser/chromeos/cros/cros_library.h"	18 #include "chrome/browser/chromeos/cros/cros_library.h"

18 #include "chrome/browser/chromeos/cros/network_library.h"	19 #include "chrome/browser/chromeos/cros/network_library.h"

19 #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"	20 #include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"

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

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

22 #include "chrome/browser/profiles/profile_manager.h"	22 #include "chrome/browser/profiles/profile_manager.h"

23 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_finder.h"	24 #include "chrome/browser/ui/browser_finder.h"

25 #include "chrome/browser/ui/host_desktop.h"	25 #include "chrome/browser/ui/host_desktop.h"

26 #include "chrome/browser/ui/singleton_tabs.h"	26 #include "chrome/browser/ui/singleton_tabs.h"

27 #include "chrome/common/pref_names.h"	27 #include "chrome/common/pref_names.h"

28 #include "chrome/common/time_format.h"	28 #include "chrome/common/time_format.h"

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

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

(...skipping 156 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187 }	187 }

188 }	188 }

189	189

190 void NetworkMessageObserver::OnConnectionInitiated(NetworkLibrary* cros,	190 void NetworkMessageObserver::OnConnectionInitiated(NetworkLibrary* cros,

191 const Network* network) {	191 const Network* network) {

192 // If user initiated any network connection, we hide the error notification.	192 // If user initiated any network connection, we hide the error notification.

193 notification_connection_error_->Hide();	193 notification_connection_error_->Hide();

194 }	194 }

195	195

196 } // namespace chromeos	196 } // namespace chromeos

OLD	NEW