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

Side by Side Diff: content/browser/debugger/devtools_window.cc

Issue 7257002: DevTools: handle docked window close in DevToolsWindow, not DevToolsManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/debugger/devtools_window.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/json/json_writer.h" 6 #include "base/json/json_writer.h"
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // Update inspected window to hide split and reset it. 214 // Update inspected window to hide split and reset it.
215 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); 215 BrowserWindow* inspected_window = GetInspectedBrowserWindow();
216 if (inspected_window) { 216 if (inspected_window) {
217 inspected_window->UpdateDevTools(); 217 inspected_window->UpdateDevTools();
218 inspected_window = NULL; 218 inspected_window = NULL;
219 } 219 }
220 } 220 }
221 Show(DEVTOOLS_TOGGLE_ACTION_NONE); 221 Show(DEVTOOLS_TOGGLE_ACTION_NONE);
222 } 222 }
223 223
224 void DevToolsWindow::Close() {
225 DCHECK(docked_);
226 NotifyCloseListener();
227 InspectedTabClosing();
228 }
229
224 RenderViewHost* DevToolsWindow::GetRenderViewHost() { 230 RenderViewHost* DevToolsWindow::GetRenderViewHost() {
225 return tab_contents_->render_view_host(); 231 return tab_contents_->render_view_host();
226 } 232 }
227 233
228 void DevToolsWindow::CreateDevToolsBrowser() { 234 void DevToolsWindow::CreateDevToolsBrowser() {
229 // TODO(pfeldman): Make browser's getter for this key static. 235 // TODO(pfeldman): Make browser's getter for this key static.
230 std::string wp_key; 236 std::string wp_key;
231 wp_key.append(prefs::kBrowserWindowPlacement); 237 wp_key.append(prefs::kBrowserWindowPlacement);
232 wp_key.append("_"); 238 wp_key.append("_");
233 wp_key.append(kDevToolsApp); 239 wp_key.append(kDevToolsApp);
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 if (docked_) { 471 if (docked_) {
466 if (event.windowsKeyCode == 0x08) { 472 if (event.windowsKeyCode == 0x08) {
467 // Do not navigate back in history on Windows (http://crbug.com/74156). 473 // Do not navigate back in history on Windows (http://crbug.com/74156).
468 return; 474 return;
469 } 475 }
470 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); 476 BrowserWindow* inspected_window = GetInspectedBrowserWindow();
471 if (inspected_window) 477 if (inspected_window)
472 inspected_window->HandleKeyboardEvent(event); 478 inspected_window->HandleKeyboardEvent(event);
473 } 479 }
474 } 480 }
OLDNEW
« no previous file with comments | « content/browser/debugger/devtools_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698