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

Side by Side Diff: chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Fix DEPS Created 4 years, 1 month 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/arc/intent_helper/arc_settings_service.h" 5 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chromeos/arc/arc_auth_service.h" 14 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
15 #include "chrome/browser/chromeos/net/onc_utils.h"
16 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
17 #include "chrome/browser/chromeos/settings/cros_settings.h" 15 #include "chrome/browser/chromeos/settings/cros_settings.h"
18 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
20 #include "chromeos/network/network_handler.h" 18 #include "chromeos/network/network_handler.h"
21 #include "chromeos/network/network_state.h" 19 #include "chromeos/network/network_state.h"
22 #include "chromeos/network/network_state_handler.h" 20 #include "chromeos/network/network_state_handler.h"
23 #include "chromeos/network/network_state_handler_observer.h" 21 #include "chromeos/network/network_state_handler_observer.h"
22 #include "chromeos/network/onc/onc_utils.h"
23 #include "chromeos/network/proxy/proxy_config_service_impl.h"
24 #include "chromeos/settings/cros_settings_names.h" 24 #include "chromeos/settings/cros_settings_names.h"
25 #include "chromeos/settings/timezone_settings.h" 25 #include "chromeos/settings/timezone_settings.h"
26 #include "components/arc/arc_bridge_service.h" 26 #include "components/arc/arc_bridge_service.h"
27 #include "components/arc/intent_helper/font_size_util.h" 27 #include "components/arc/intent_helper/font_size_util.h"
28 #include "components/onc/onc_pref_names.h" 28 #include "components/onc/onc_pref_names.h"
29 #include "components/prefs/pref_change_registrar.h" 29 #include "components/prefs/pref_change_registrar.h"
30 #include "components/prefs/pref_service.h" 30 #include "components/prefs/pref_service.h"
31 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 31 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
32 #include "components/proxy_config/proxy_config_dictionary.h" 32 #include "components/proxy_config/proxy_config_dictionary.h"
33 #include "components/proxy_config/proxy_config_pref_names.h" 33 #include "components/proxy_config/proxy_config_pref_names.h"
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 505
506 void ArcSettingsService::OnInstanceReady() { 506 void ArcSettingsService::OnInstanceReady() {
507 impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service())); 507 impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service()));
508 } 508 }
509 509
510 void ArcSettingsService::OnInstanceClosed() { 510 void ArcSettingsService::OnInstanceClosed() {
511 impl_.reset(); 511 impl_.reset();
512 } 512 }
513 513
514 } // namespace arc 514 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698