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

Side by Side Diff: chrome/browser/debugger/devtools_sanity_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: Return NULL as the ToggleDevToolsWindow() result for DevTools windows Created 8 years, 4 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/bind.h" 5 #include "base/bind.h"
6 #include "base/cancelable_callback.h" 6 #include "base/cancelable_callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 BrowserThread::PostTask( 376 BrowserThread::PostTask(
377 BrowserThread::IO, FROM_HERE, 377 BrowserThread::IO, FROM_HERE,
378 base::Bind(&WaitForFirstSharedWorkerOnIOThread, worker_data)); 378 base::Bind(&WaitForFirstSharedWorkerOnIOThread, worker_data));
379 content::RunMessageLoop(); 379 content::RunMessageLoop();
380 return worker_data; 380 return worker_data;
381 } 381 }
382 382
383 void OpenDevToolsWindowForSharedWorker(WorkerData* worker_data) { 383 void OpenDevToolsWindowForSharedWorker(WorkerData* worker_data) {
384 Profile* profile = browser()->profile(); 384 Profile* profile = browser()->profile();
385 window_ = DevToolsWindow::CreateDevToolsWindowForWorker(profile); 385 window_ = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
386 window_->Show(DEVTOOLS_TOGGLE_ACTION_NONE); 386 window_->Show(DEVTOOLS_TOGGLE_ACTION_SHOW);
387 DevToolsAgentHost* agent_host = 387 DevToolsAgentHost* agent_host =
388 DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker( 388 DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker(
389 worker_data->worker_process_id, 389 worker_data->worker_process_id,
390 worker_data->worker_route_id); 390 worker_data->worker_route_id);
391 DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor( 391 DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
392 agent_host, 392 agent_host,
393 window_->devtools_client_host()); 393 window_->devtools_client_host());
394 RenderViewHost* client_rvh = window_->GetRenderViewHost(); 394 RenderViewHost* client_rvh = window_->GetRenderViewHost();
395 WebContents* client_contents = WebContents::FromRenderViewHost(client_rvh); 395 WebContents* client_contents = WebContents::FromRenderViewHost(client_rvh);
396 if (client_contents->IsLoading()) { 396 if (client_contents->IsLoading()) {
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 content::CONSOLE_MESSAGE_LEVEL_LOG, 611 content::CONSOLE_MESSAGE_LEVEL_LOG,
612 "log"); 612 "log");
613 devtools_manager->AddMessageToConsole(agent_host, 613 devtools_manager->AddMessageToConsole(agent_host,
614 content::CONSOLE_MESSAGE_LEVEL_ERROR, 614 content::CONSOLE_MESSAGE_LEVEL_ERROR,
615 "error"); 615 "error");
616 RunTestFunction(window_, "checkLogAndErrorMessages"); 616 RunTestFunction(window_, "checkLogAndErrorMessages");
617 CloseDevToolsWindow(); 617 CloseDevToolsWindow();
618 } 618 }
619 619
620 } // namespace 620 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698