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

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

Issue 1925183004: arc_bridge: Add more logging, plus cleanup (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Fixed unit tests Created 4 years, 7 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 | « chrome/browser/chromeos/arc/arc_policy_bridge.cc ('k') | components/arc/arc_bridge_bootstrap.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 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/arc_settings_service.h" 5 #include "chrome/browser/chromeos/arc/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"
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 if (!proxy_config_dict.GetMode(&mode)) 316 if (!proxy_config_dict.GetMode(&mode))
317 mode = ProxyPrefs::MODE_DIRECT; 317 mode = ProxyPrefs::MODE_DIRECT;
318 318
319 base::DictionaryValue extras; 319 base::DictionaryValue extras;
320 extras.SetString("mode", ProxyPrefs::ProxyModeToString(mode)); 320 extras.SetString("mode", ProxyPrefs::ProxyModeToString(mode));
321 321
322 switch (mode) { 322 switch (mode) {
323 case ProxyPrefs::MODE_DIRECT: 323 case ProxyPrefs::MODE_DIRECT:
324 break; 324 break;
325 case ProxyPrefs::MODE_SYSTEM: 325 case ProxyPrefs::MODE_SYSTEM:
326 LOG(WARNING) << "The system mode is not translated."; 326 VLOG(1) << "The system mode is not translated.";
327 return; 327 return;
328 case ProxyPrefs::MODE_AUTO_DETECT: 328 case ProxyPrefs::MODE_AUTO_DETECT:
329 extras.SetString("pacUrl", "http://wpad/wpad.dat"); 329 extras.SetString("pacUrl", "http://wpad/wpad.dat");
330 break; 330 break;
331 case ProxyPrefs::MODE_PAC_SCRIPT: { 331 case ProxyPrefs::MODE_PAC_SCRIPT: {
332 std::string pac_url; 332 std::string pac_url;
333 if (!proxy_config_dict.GetPacUrl(&pac_url)) { 333 if (!proxy_config_dict.GetPacUrl(&pac_url)) {
334 LOG(ERROR) << "No pac URL for pac_script proxy mode."; 334 LOG(ERROR) << "No pac URL for pac_script proxy mode.";
335 return; 335 return;
336 } 336 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 392
393 void ArcSettingsService::OnIntentHelperInstanceReady() { 393 void ArcSettingsService::OnIntentHelperInstanceReady() {
394 impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service())); 394 impl_.reset(new ArcSettingsServiceImpl(arc_bridge_service()));
395 } 395 }
396 396
397 void ArcSettingsService::OnIntentHelperInstanceClosed() { 397 void ArcSettingsService::OnIntentHelperInstanceClosed() {
398 impl_.reset(); 398 impl_.reset();
399 } 399 }
400 400
401 } // namespace arc 401 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_policy_bridge.cc ('k') | components/arc/arc_bridge_bootstrap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698