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

Side by Side Diff: chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc

Issue 10823233: Close detached DevTools window (rather than open a new instance) when it receives an F12 keypress (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win compilation fixed Created 8 years, 3 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
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/debugger/devtools_window.h" 6 #include "chrome/browser/debugger/devtools_window.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/browser_tabstrip.h" 9 #include "chrome/browser/ui/browser_tabstrip.h"
10 #include "chrome/browser/ui/singleton_tabs.h" 10 #include "chrome/browser/ui/singleton_tabs.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 chrome::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_INSPECT); 298 chrome::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_INSPECT);
299 host_count++; 299 host_count++;
300 EXPECT_EQ(tab_count, browser()->tab_count()); 300 EXPECT_EQ(tab_count, browser()->tab_count());
301 EXPECT_EQ(host_count, RenderProcessHostCount()); 301 EXPECT_EQ(host_count, RenderProcessHostCount());
302 302
303 RenderViewHost* devtools = FindFirstDevToolsHost(); 303 RenderViewHost* devtools = FindFirstDevToolsHost();
304 DCHECK(devtools); 304 DCHECK(devtools);
305 305
306 // DevTools start in a separate process. 306 // DevTools start in a separate process.
307 DevToolsWindow::ToggleDevToolsWindow( 307 DevToolsWindow::ToggleDevToolsWindow(
308 devtools, DEVTOOLS_TOGGLE_ACTION_INSPECT); 308 devtools, true, DEVTOOLS_TOGGLE_ACTION_INSPECT);
309 host_count++; 309 host_count++;
310 EXPECT_EQ(tab_count, browser()->tab_count()); 310 EXPECT_EQ(tab_count, browser()->tab_count());
311 EXPECT_EQ(host_count, RenderProcessHostCount()); 311 EXPECT_EQ(host_count, RenderProcessHostCount());
312 } 312 }
313 313
314 // Ensure that DevTools opened to debug DevTools is launched in a separate 314 // Ensure that DevTools opened to debug DevTools is launched in a separate
315 // process. See crbug.com/69873. 315 // process. See crbug.com/69873.
316 IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest, 316 IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest,
317 DevToolsOnSelfInOwnProcess) { 317 DevToolsOnSelfInOwnProcess) {
318 int tab_count = 1; 318 int tab_count = 1;
(...skipping 12 matching lines...) Expand all
331 chrome::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_INSPECT); 331 chrome::ToggleDevToolsWindow(browser(), DEVTOOLS_TOGGLE_ACTION_INSPECT);
332 host_count++; 332 host_count++;
333 EXPECT_EQ(tab_count, browser()->tab_count()); 333 EXPECT_EQ(tab_count, browser()->tab_count());
334 EXPECT_EQ(host_count, RenderProcessHostCount()); 334 EXPECT_EQ(host_count, RenderProcessHostCount());
335 335
336 RenderViewHost* devtools = FindFirstDevToolsHost(); 336 RenderViewHost* devtools = FindFirstDevToolsHost();
337 DCHECK(devtools); 337 DCHECK(devtools);
338 338
339 // DevTools start in a separate process. 339 // DevTools start in a separate process.
340 DevToolsWindow::ToggleDevToolsWindow( 340 DevToolsWindow::ToggleDevToolsWindow(
341 devtools, DEVTOOLS_TOGGLE_ACTION_INSPECT); 341 devtools, true, DEVTOOLS_TOGGLE_ACTION_INSPECT);
342 host_count++; 342 host_count++;
343 EXPECT_EQ(tab_count, browser()->tab_count()); 343 EXPECT_EQ(tab_count, browser()->tab_count());
344 EXPECT_EQ(host_count, RenderProcessHostCount()); 344 EXPECT_EQ(host_count, RenderProcessHostCount());
345 } 345 }
OLDNEW
« no previous file with comments | « chrome/browser/debugger/devtools_window.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698