| 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 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 | 1106 |
| 1107 Show(DevToolsToggleAction::Show()); | 1107 Show(DevToolsToggleAction::Show()); |
| 1108 } | 1108 } |
| 1109 | 1109 |
| 1110 void DevToolsWindow::OpenInNewTab(const std::string& url) { | 1110 void DevToolsWindow::OpenInNewTab(const std::string& url) { |
| 1111 content::OpenURLParams params( | 1111 content::OpenURLParams params( |
| 1112 GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, | 1112 GURL(url), content::Referrer(), NEW_FOREGROUND_TAB, |
| 1113 ui::PAGE_TRANSITION_LINK, false); | 1113 ui::PAGE_TRANSITION_LINK, false); |
| 1114 WebContents* inspected_web_contents = GetInspectedWebContents(); | 1114 WebContents* inspected_web_contents = GetInspectedWebContents(); |
| 1115 if (!inspected_web_contents || !inspected_web_contents->OpenURL(params)) { | 1115 if (!inspected_web_contents || !inspected_web_contents->OpenURL(params)) { |
| 1116 chrome::HostDesktopType host_desktop_type = | 1116 chrome::ScopedTabbedBrowserDisplayer displayer(profile_); |
| 1117 browser_ ? browser_->host_desktop_type() : chrome::GetActiveDesktop(); | |
| 1118 | |
| 1119 chrome::ScopedTabbedBrowserDisplayer displayer(profile_, host_desktop_type); | |
| 1120 chrome::AddSelectedTabWithURL(displayer.browser(), GURL(url), | 1117 chrome::AddSelectedTabWithURL(displayer.browser(), GURL(url), |
| 1121 ui::PAGE_TRANSITION_LINK); | 1118 ui::PAGE_TRANSITION_LINK); |
| 1122 } | 1119 } |
| 1123 } | 1120 } |
| 1124 | 1121 |
| 1125 void DevToolsWindow::SetWhitelistedShortcuts( | 1122 void DevToolsWindow::SetWhitelistedShortcuts( |
| 1126 const std::string& message) { | 1123 const std::string& message) { |
| 1127 event_forwarder_->SetWhitelistedShortcuts(message); | 1124 event_forwarder_->SetWhitelistedShortcuts(message); |
| 1128 } | 1125 } |
| 1129 | 1126 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1184 base::DictionaryValue* dev_tools_defaults = new base::DictionaryValue; | 1181 base::DictionaryValue* dev_tools_defaults = new base::DictionaryValue; |
| 1185 wp_prefs->Set(kDevToolsApp, dev_tools_defaults); | 1182 wp_prefs->Set(kDevToolsApp, dev_tools_defaults); |
| 1186 dev_tools_defaults->SetInteger("left", 100); | 1183 dev_tools_defaults->SetInteger("left", 100); |
| 1187 dev_tools_defaults->SetInteger("top", 100); | 1184 dev_tools_defaults->SetInteger("top", 100); |
| 1188 dev_tools_defaults->SetInteger("right", 740); | 1185 dev_tools_defaults->SetInteger("right", 740); |
| 1189 dev_tools_defaults->SetInteger("bottom", 740); | 1186 dev_tools_defaults->SetInteger("bottom", 740); |
| 1190 dev_tools_defaults->SetBoolean("maximized", false); | 1187 dev_tools_defaults->SetBoolean("maximized", false); |
| 1191 dev_tools_defaults->SetBoolean("always_on_top", false); | 1188 dev_tools_defaults->SetBoolean("always_on_top", false); |
| 1192 } | 1189 } |
| 1193 | 1190 |
| 1194 browser_ = new Browser(Browser::CreateParams::CreateForDevTools( | 1191 browser_ = new Browser(Browser::CreateParams::CreateForDevTools(profile_)); |
| 1195 profile_, | |
| 1196 chrome::GetHostDesktopTypeForNativeView( | |
| 1197 main_web_contents_->GetNativeView()))); | |
| 1198 browser_->tab_strip_model()->AddWebContents( | 1192 browser_->tab_strip_model()->AddWebContents( |
| 1199 main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, | 1193 main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, |
| 1200 TabStripModel::ADD_ACTIVE); | 1194 TabStripModel::ADD_ACTIVE); |
| 1201 main_web_contents_->GetRenderViewHost()->SyncRendererPrefs(); | 1195 main_web_contents_->GetRenderViewHost()->SyncRendererPrefs(); |
| 1202 } | 1196 } |
| 1203 | 1197 |
| 1204 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() { | 1198 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() { |
| 1205 Browser* browser = NULL; | 1199 Browser* browser = NULL; |
| 1206 int tab; | 1200 int tab; |
| 1207 return FindInspectedBrowserAndTabIndex(GetInspectedWebContents(), | 1201 return FindInspectedBrowserAndTabIndex(GetInspectedWebContents(), |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1295 bool DevToolsWindow::ReloadInspectedWebContents(bool ignore_cache) { | 1289 bool DevToolsWindow::ReloadInspectedWebContents(bool ignore_cache) { |
| 1296 // Only route reload via front-end if the agent is attached. | 1290 // Only route reload via front-end if the agent is attached. |
| 1297 WebContents* wc = GetInspectedWebContents(); | 1291 WebContents* wc = GetInspectedWebContents(); |
| 1298 if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING) | 1292 if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING) |
| 1299 return false; | 1293 return false; |
| 1300 base::FundamentalValue ignore_cache_value(ignore_cache); | 1294 base::FundamentalValue ignore_cache_value(ignore_cache); |
| 1301 bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage", | 1295 bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage", |
| 1302 &ignore_cache_value, nullptr, nullptr); | 1296 &ignore_cache_value, nullptr, nullptr); |
| 1303 return true; | 1297 return true; |
| 1304 } | 1298 } |
| OLD | NEW |