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

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

Issue 8493017: Cleanup extension permissions module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 11 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) 2011 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
(...skipping 24 matching lines...) Expand all
36 #include "content/browser/load_notification_details.h" 36 #include "content/browser/load_notification_details.h"
37 #include "content/browser/renderer_host/render_view_host.h" 37 #include "content/browser/renderer_host/render_view_host.h"
38 #include "content/browser/tab_contents/tab_contents_view.h" 38 #include "content/browser/tab_contents/tab_contents_view.h"
39 #include "content/public/browser/content_browser_client.h" 39 #include "content/public/browser/content_browser_client.h"
40 #include "content/public/browser/devtools_agent_host_registry.h" 40 #include "content/public/browser/devtools_agent_host_registry.h"
41 #include "content/public/browser/devtools_manager.h" 41 #include "content/public/browser/devtools_manager.h"
42 #include "content/public/browser/favicon_status.h" 42 #include "content/public/browser/favicon_status.h"
43 #include "content/public/browser/navigation_controller.h" 43 #include "content/public/browser/navigation_controller.h"
44 #include "content/public/browser/navigation_entry.h" 44 #include "content/public/browser/navigation_entry.h"
45 #include "content/public/browser/notification_source.h" 45 #include "content/public/browser/notification_source.h"
46 #include "content/public/browser/render_process_host.h"
46 #include "content/public/browser/web_contents.h" 47 #include "content/public/browser/web_contents.h"
47 #include "content/public/common/bindings_policy.h" 48 #include "content/public/common/bindings_policy.h"
48 #include "grit/generated_resources.h" 49 #include "grit/generated_resources.h"
49 50
50 typedef std::vector<DevToolsWindow*> DevToolsWindowList; 51 typedef std::vector<DevToolsWindow*> DevToolsWindowList;
51 namespace { 52 namespace {
52 base::LazyInstance<DevToolsWindowList, 53 base::LazyInstance<DevToolsWindowList,
53 base::LeakyLazyInstanceTraits<DevToolsWindowList> > 54 base::LeakyLazyInstanceTraits<DevToolsWindowList> >
54 g_instances = LAZY_INSTANCE_INITIALIZER; 55 g_instances = LAZY_INSTANCE_INITIALIZER;
55 } // namespace 56 } // namespace
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 content); 724 content);
724 } 725 }
725 726
726 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { 727 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
727 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { 728 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) {
728 return inspected_tab_->web_contents()->GetDelegate()-> 729 return inspected_tab_->web_contents()->GetDelegate()->
729 GetJavaScriptDialogCreator(); 730 GetJavaScriptDialogCreator();
730 } 731 }
731 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); 732 return content::WebContentsDelegate::GetJavaScriptDialogCreator();
732 } 733 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698