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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/base64.h" 14 #include "base/base64.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/compiler_specific.h" 17 #include "base/compiler_specific.h"
18 #include "base/json/json_reader.h" 18 #include "base/json/json_reader.h"
19 #include "base/lazy_instance.h" 19 #include "base/lazy_instance.h"
20 #include "base/macros.h" 20 #include "base/macros.h"
21 #include "base/memory/singleton.h" 21 #include "base/memory/singleton.h"
22 #include "base/message_loop/message_loop.h" 22 #include "base/message_loop/message_loop.h"
23 #include "base/prefs/pref_service.h"
24 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
25 #include "base/strings/string_split.h" 24 #include "base/strings/string_split.h"
26 #include "base/strings/string_util.h" 25 #include "base/strings/string_util.h"
27 #include "base/strings/stringprintf.h" 26 #include "base/strings/stringprintf.h"
28 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
29 #include "base/threading/thread.h" 28 #include "base/threading/thread.h"
30 #include "base/values.h" 29 #include "base/values.h"
31 #include "chrome/browser/devtools/device/adb/adb_device_provider.h" 30 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
32 #include "chrome/browser/devtools/device/port_forwarding_controller.h" 31 #include "chrome/browser/devtools/device/port_forwarding_controller.h"
33 #include "chrome/browser/devtools/device/tcp_device_provider.h" 32 #include "chrome/browser/devtools/device/tcp_device_provider.h"
34 #include "chrome/browser/devtools/device/usb/usb_device_provider.h" 33 #include "chrome/browser/devtools/device/usb/usb_device_provider.h"
35 #include "chrome/browser/devtools/devtools_protocol.h" 34 #include "chrome/browser/devtools/devtools_protocol.h"
36 #include "chrome/browser/devtools/devtools_target_impl.h" 35 #include "chrome/browser/devtools/devtools_target_impl.h"
37 #include "chrome/browser/devtools/devtools_window.h" 36 #include "chrome/browser/devtools/devtools_window.h"
38 #include "chrome/browser/devtools/remote_debugging_server.h" 37 #include "chrome/browser/devtools/remote_debugging_server.h"
39 #include "chrome/browser/profiles/profile.h" 38 #include "chrome/browser/profiles/profile.h"
40 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
42 #include "components/keyed_service/content/browser_context_dependency_manager.h" 41 #include "components/keyed_service/content/browser_context_dependency_manager.h"
42 #include "components/prefs/pref_service.h"
43 #include "components/signin/core/browser/profile_oauth2_token_service.h" 43 #include "components/signin/core/browser/profile_oauth2_token_service.h"
44 #include "components/signin/core/browser/signin_manager.h" 44 #include "components/signin/core/browser/signin_manager.h"
45 #include "content/public/browser/devtools_agent_host.h" 45 #include "content/public/browser/devtools_agent_host.h"
46 #include "content/public/browser/devtools_external_agent_proxy.h" 46 #include "content/public/browser/devtools_external_agent_proxy.h"
47 #include "content/public/browser/devtools_external_agent_proxy_delegate.h" 47 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
48 #include "content/public/browser/user_metrics.h" 48 #include "content/public/browser/user_metrics.h"
49 #include "net/base/escape.h" 49 #include "net/base/escape.h"
50 #include "net/base/host_port_pair.h" 50 #include "net/base/host_port_pair.h"
51 #include "net/base/net_errors.h" 51 #include "net/base/net_errors.h"
52 52
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 if (pref_value->GetAsBoolean(&enabled) && enabled) { 943 if (pref_value->GetAsBoolean(&enabled) && enabled) {
944 device_providers.push_back(new UsbDeviceProvider(profile_)); 944 device_providers.push_back(new UsbDeviceProvider(profile_));
945 } 945 }
946 946
947 device_manager_->SetDeviceProviders(device_providers); 947 device_manager_->SetDeviceProviders(device_providers);
948 if (NeedsDeviceListPolling()) { 948 if (NeedsDeviceListPolling()) {
949 StopDeviceListPolling(); 949 StopDeviceListPolling();
950 StartDeviceListPolling(); 950 StartDeviceListPolling();
951 } 951 }
952 } 952 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698