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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc

Issue 442303002: DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for landing Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/extensions/file_manager/private_api_misc.h" 5 #include "chrome/browser/chromeos/extensions/file_manager/private_api_misc.h"
6 6
7 #include "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "ash/frame/frame_util.h" 9 #include "ash/frame/frame_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 } 450 }
451 451
452 bool FileBrowserPrivateOpenInspectorFunction::RunSync() { 452 bool FileBrowserPrivateOpenInspectorFunction::RunSync() {
453 using extensions::api::file_browser_private::OpenInspector::Params; 453 using extensions::api::file_browser_private::OpenInspector::Params;
454 const scoped_ptr<Params> params(Params::Create(*args_)); 454 const scoped_ptr<Params> params(Params::Create(*args_));
455 EXTENSION_FUNCTION_VALIDATE(params); 455 EXTENSION_FUNCTION_VALIDATE(params);
456 456
457 switch (params->type) { 457 switch (params->type) {
458 case extensions::api::file_browser_private::INSPECTION_TYPE_NORMAL: 458 case extensions::api::file_browser_private::INSPECTION_TYPE_NORMAL:
459 // Open inspector for foreground page. 459 // Open inspector for foreground page.
460 DevToolsWindow::OpenDevToolsWindow(render_view_host()); 460 DevToolsWindow::OpenDevToolsWindow(
461 content::WebContents::FromRenderViewHost(render_view_host()));
461 break; 462 break;
462 case extensions::api::file_browser_private::INSPECTION_TYPE_CONSOLE: 463 case extensions::api::file_browser_private::INSPECTION_TYPE_CONSOLE:
463 // Open inspector for foreground page and bring focus to the console. 464 // Open inspector for foreground page and bring focus to the console.
464 DevToolsWindow::OpenDevToolsWindow(render_view_host(), 465 DevToolsWindow::OpenDevToolsWindow(
465 DevToolsToggleAction::ShowConsole()); 466 content::WebContents::FromRenderViewHost(render_view_host()),
467 DevToolsToggleAction::ShowConsole());
466 break; 468 break;
467 case extensions::api::file_browser_private::INSPECTION_TYPE_ELEMENT: 469 case extensions::api::file_browser_private::INSPECTION_TYPE_ELEMENT:
468 // Open inspector for foreground page in inspect element mode. 470 // Open inspector for foreground page in inspect element mode.
469 DevToolsWindow::OpenDevToolsWindow(render_view_host(), 471 DevToolsWindow::OpenDevToolsWindow(
470 DevToolsToggleAction::Inspect()); 472 content::WebContents::FromRenderViewHost(render_view_host()),
473 DevToolsToggleAction::Inspect());
471 break; 474 break;
472 case extensions::api::file_browser_private::INSPECTION_TYPE_BACKGROUND: 475 case extensions::api::file_browser_private::INSPECTION_TYPE_BACKGROUND:
473 // Open inspector for background page. 476 // Open inspector for background page.
474 extensions::devtools_util::InspectBackgroundPage(extension(), 477 extensions::devtools_util::InspectBackgroundPage(extension(),
475 GetProfile()); 478 GetProfile());
476 break; 479 break;
477 default: 480 default:
478 NOTREACHED(); 481 NOTREACHED();
479 SetError( 482 SetError(
480 base::StringPrintf("Unexpected inspection type(%d) is specified.", 483 base::StringPrintf("Unexpected inspection type(%d) is specified.",
481 static_cast<int>(params->type))); 484 static_cast<int>(params->type)));
482 return false; 485 return false;
483 } 486 }
484 return true; 487 return true;
485 } 488 }
486 489
487 } // namespace extensions 490 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/devtools/browser_list_tabcontents_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698