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

Side by Side Diff: chromecast/common/chromecast_config.cc

Issue 454063004: Adds remote devtools support to cast_shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 4 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
« no previous file with comments | « chromecast/chromecast.gyp ('k') | chromecast/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromecast/common/chromecast_config.h" 5 #include "chromecast/common/chromecast_config.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/prefs/json_pref_store.h" 13 #include "base/prefs/json_pref_store.h"
14 #include "base/prefs/pref_registry_simple.h" 14 #include "base/prefs/pref_registry_simple.h"
15 #include "base/prefs/pref_service_factory.h" 15 #include "base/prefs/pref_service_factory.h"
16 #include "base/prefs/pref_store.h" 16 #include "base/prefs/pref_store.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "chromecast/common/cast_paths.h" 18 #include "chromecast/common/cast_paths.h"
19 #include "chromecast/common/pref_names.h"
19 20
20 namespace chromecast { 21 namespace chromecast {
21 22
22 namespace { 23 namespace {
23 24
24 // Config file IO worker constants. 25 // Config file IO worker constants.
25 const int kNumOfConfigFileIOWorkers = 1; 26 const int kNumOfConfigFileIOWorkers = 1;
26 const char kNameOfConfigFileIOWorkers[] = "ConfigFileIO"; 27 const char kNameOfConfigFileIOWorkers[] = "ConfigFileIO";
27 28
28 void UserPrefsLoadError( 29 void UserPrefsLoadError(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 65
65 ChromecastConfig::~ChromecastConfig() { 66 ChromecastConfig::~ChromecastConfig() {
66 // Explict writing before worker_pool shutdown. 67 // Explict writing before worker_pool shutdown.
67 pref_service_->CommitPendingWrite(); 68 pref_service_->CommitPendingWrite();
68 worker_pool_->Shutdown(); 69 worker_pool_->Shutdown();
69 } 70 }
70 71
71 bool ChromecastConfig::Load(PrefRegistrySimple* registry) { 72 bool ChromecastConfig::Load(PrefRegistrySimple* registry) {
72 DCHECK(thread_checker_.CalledOnValidThread()); 73 DCHECK(thread_checker_.CalledOnValidThread());
73 VLOG(1) << "Loading config from " << config_path_.value(); 74 VLOG(1) << "Loading config from " << config_path_.value();
75 registry->RegisterIntegerPref(prefs::kRemoteDebuggingPort, 0);
74 76
75 RegisterPlatformPrefs(registry); 77 RegisterPlatformPrefs(registry);
76 78
77 PersistentPrefStore::PrefReadError prefs_read_error = 79 PersistentPrefStore::PrefReadError prefs_read_error =
78 PersistentPrefStore::PREF_READ_ERROR_NONE; 80 PersistentPrefStore::PREF_READ_ERROR_NONE;
79 base::PrefServiceFactory prefServiceFactory; 81 base::PrefServiceFactory prefServiceFactory;
80 prefServiceFactory.SetUserPrefsFile(config_path_, 82 prefServiceFactory.SetUserPrefsFile(config_path_,
81 JsonPrefStore::GetTaskRunnerForFile(config_path_, worker_pool_)); 83 JsonPrefStore::GetTaskRunnerForFile(config_path_, worker_pool_));
82 prefServiceFactory.set_async(false); 84 prefServiceFactory.set_async(false);
83 prefServiceFactory.set_read_error_callback( 85 prefServiceFactory.set_read_error_callback(
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (pref_service_->IsUserModifiablePreference(key.c_str())) { 129 if (pref_service_->IsUserModifiablePreference(key.c_str())) {
128 VLOG(1) << "Set config: key=" << key << ", value=" << value; 130 VLOG(1) << "Set config: key=" << key << ", value=" << value;
129 pref_service_->SetInteger(key.c_str(), value); 131 pref_service_->SetInteger(key.c_str(), value);
130 } else { 132 } else {
131 LOG(ERROR) << "Cannot set read-only config: key=" << key 133 LOG(ERROR) << "Cannot set read-only config: key=" << key
132 << ", value=" << value; 134 << ", value=" << value;
133 } 135 }
134 } 136 }
135 137
136 } // namespace chromecast 138 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/chromecast.gyp ('k') | chromecast/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698