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

Side by Side Diff: chromeos/network/network_handler.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chromeos/network/network_handler.h" 5 #include "chromeos/network/network_handler.h"
6 6
7 #include "base/threading/thread_task_runner_handle.h" 7 #include "base/threading/thread_task_runner_handle.h"
8 #include "base/threading/worker_pool.h" 8 #include "base/threading/worker_pool.h"
9 #include "chromeos/dbus/dbus_thread_manager.h" 9 #include "chromeos/dbus/dbus_thread_manager.h"
10 #include "chromeos/network/auto_connect_handler.h" 10 #include "chromeos/network/auto_connect_handler.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 // static 97 // static
98 void NetworkHandler::Shutdown() { 98 void NetworkHandler::Shutdown() {
99 CHECK(g_network_handler); 99 CHECK(g_network_handler);
100 delete g_network_handler; 100 delete g_network_handler;
101 g_network_handler = NULL; 101 g_network_handler = NULL;
102 } 102 }
103 103
104 // static 104 // static
105 NetworkHandler* NetworkHandler::Get() { 105 NetworkHandler* NetworkHandler::Get() {
106 CHECK(g_network_handler) 106 // NetworkHandler::Get() called before Initialize()
107 << "NetworkHandler::Get() called before Initialize()"; 107 CHECK(g_network_handler);
108 return g_network_handler; 108 return g_network_handler;
109 } 109 }
110 110
111 // static 111 // static
112 bool NetworkHandler::IsInitialized() { 112 bool NetworkHandler::IsInitialized() {
113 return g_network_handler; 113 return g_network_handler;
114 } 114 }
115 115
116 void NetworkHandler::InitializePrefServices( 116 void NetworkHandler::InitializePrefServices(
117 PrefService* logged_in_profile_prefs, 117 PrefService* logged_in_profile_prefs,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 NetworkHandler::prohibited_technologies_handler() { 165 NetworkHandler::prohibited_technologies_handler() {
166 return prohibited_technologies_handler_.get(); 166 return prohibited_technologies_handler_.get();
167 } 167 }
168 168
169 UIProxyConfigService* NetworkHandler::ui_proxy_config_service() { 169 UIProxyConfigService* NetworkHandler::ui_proxy_config_service() {
170 CHECK(ui_proxy_config_service_.get()); 170 CHECK(ui_proxy_config_service_.get());
171 return ui_proxy_config_service_.get(); 171 return ui_proxy_config_service_.get();
172 } 172 }
173 173
174 } // namespace chromeos 174 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698