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

Side by Side Diff: chrome/browser/devtools/device/devtools_android_bridge.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/devtools/device/devtools_android_bridge.h" 5 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 250
251 ProtocolCommand::~ProtocolCommand() { 251 ProtocolCommand::~ProtocolCommand() {
252 if (!callback_.is_null()) 252 if (!callback_.is_null())
253 callback_.Run(); 253 callback_.Run();
254 } 254 }
255 255
256 } // namespace 256 } // namespace
257 257
258 // static 258 // static
259 DevToolsAndroidBridge::Factory* DevToolsAndroidBridge::Factory::GetInstance() { 259 DevToolsAndroidBridge::Factory* DevToolsAndroidBridge::Factory::GetInstance() {
260 return Singleton<DevToolsAndroidBridge::Factory>::get(); 260 return base::Singleton<DevToolsAndroidBridge::Factory>::get();
261 } 261 }
262 262
263 // static 263 // static
264 DevToolsAndroidBridge* DevToolsAndroidBridge::Factory::GetForProfile( 264 DevToolsAndroidBridge* DevToolsAndroidBridge::Factory::GetForProfile(
265 Profile* profile) { 265 Profile* profile) {
266 return static_cast<DevToolsAndroidBridge*>(GetInstance()-> 266 return static_cast<DevToolsAndroidBridge*>(GetInstance()->
267 GetServiceForBrowserContext(profile, true)); 267 GetServiceForBrowserContext(profile, true));
268 } 268 }
269 269
270 DevToolsAndroidBridge::Factory::Factory() 270 DevToolsAndroidBridge::Factory::Factory()
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 device_providers.push_back( 960 device_providers.push_back(
961 new WebRTCDeviceProvider(profile_, signin_manager_, token_service_)); 961 new WebRTCDeviceProvider(profile_, signin_manager_, token_service_));
962 } 962 }
963 963
964 device_manager_->SetDeviceProviders(device_providers); 964 device_manager_->SetDeviceProviders(device_providers);
965 if (NeedsDeviceListPolling()) { 965 if (NeedsDeviceListPolling()) {
966 StopDeviceListPolling(); 966 StopDeviceListPolling();
967 StartDeviceListPolling(); 967 StartDeviceListPolling();
968 } 968 }
969 } 969 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/devtools_android_bridge.h ('k') | chrome/browser/diagnostics/diagnostics_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698