| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/devtools_window.h" | 5 #include "chrome/browser/devtools/devtools_window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 registry->RegisterBooleanPref(prefs::kDevToolsDiscoverUsbDevicesEnabled, | 385 registry->RegisterBooleanPref(prefs::kDevToolsDiscoverUsbDevicesEnabled, |
| 386 true); | 386 true); |
| 387 registry->RegisterBooleanPref(prefs::kDevToolsPortForwardingEnabled, false); | 387 registry->RegisterBooleanPref(prefs::kDevToolsPortForwardingEnabled, false); |
| 388 registry->RegisterBooleanPref(prefs::kDevToolsPortForwardingDefaultSet, | 388 registry->RegisterBooleanPref(prefs::kDevToolsPortForwardingDefaultSet, |
| 389 false); | 389 false); |
| 390 registry->RegisterDictionaryPref(prefs::kDevToolsPortForwardingConfig); | 390 registry->RegisterDictionaryPref(prefs::kDevToolsPortForwardingConfig); |
| 391 registry->RegisterBooleanPref(prefs::kDevToolsDiscoverTCPTargetsEnabled, | 391 registry->RegisterBooleanPref(prefs::kDevToolsDiscoverTCPTargetsEnabled, |
| 392 true); | 392 true); |
| 393 registry->RegisterListPref(prefs::kDevToolsTCPDiscoveryConfig); | 393 registry->RegisterListPref(prefs::kDevToolsTCPDiscoveryConfig); |
| 394 registry->RegisterDictionaryPref(prefs::kDevToolsPreferences); | 394 registry->RegisterDictionaryPref(prefs::kDevToolsPreferences); |
| 395 registry->RegisterBooleanPref(prefs::kDevToolsSilentManagedDebuggerAPIEnabled, |
| 396 false); |
| 395 } | 397 } |
| 396 | 398 |
| 397 // static | 399 // static |
| 398 content::WebContents* DevToolsWindow::GetInTabWebContents( | 400 content::WebContents* DevToolsWindow::GetInTabWebContents( |
| 399 WebContents* inspected_web_contents, | 401 WebContents* inspected_web_contents, |
| 400 DevToolsContentsResizingStrategy* out_strategy) { | 402 DevToolsContentsResizingStrategy* out_strategy) { |
| 401 DevToolsWindow* window = GetInstanceForInspectedWebContents( | 403 DevToolsWindow* window = GetInstanceForInspectedWebContents( |
| 402 inspected_web_contents); | 404 inspected_web_contents); |
| 403 if (!window || window->life_stage_ == kClosing) | 405 if (!window || window->life_stage_ == kClosing) |
| 404 return NULL; | 406 return NULL; |
| (...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1409 bool DevToolsWindow::ReloadInspectedWebContents(bool bypass_cache) { | 1411 bool DevToolsWindow::ReloadInspectedWebContents(bool bypass_cache) { |
| 1410 // Only route reload via front-end if the agent is attached. | 1412 // Only route reload via front-end if the agent is attached. |
| 1411 WebContents* wc = GetInspectedWebContents(); | 1413 WebContents* wc = GetInspectedWebContents(); |
| 1412 if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING) | 1414 if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING) |
| 1413 return false; | 1415 return false; |
| 1414 base::FundamentalValue bypass_cache_value(bypass_cache); | 1416 base::FundamentalValue bypass_cache_value(bypass_cache); |
| 1415 bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage", | 1417 bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage", |
| 1416 &bypass_cache_value, nullptr, nullptr); | 1418 &bypass_cache_value, nullptr, nullptr); |
| 1417 return true; | 1419 return true; |
| 1418 } | 1420 } |
| OLD | NEW |