| OLD | NEW |
| 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 <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" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "content/public/browser/notification_source.h" | 43 #include "content/public/browser/notification_source.h" |
| 44 #include "content/public/browser/render_process_host.h" | 44 #include "content/public/browser/render_process_host.h" |
| 45 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
| 46 #include "content/public/browser/web_contents_view.h" | 46 #include "content/public/browser/web_contents_view.h" |
| 47 #include "content/public/common/bindings_policy.h" | 47 #include "content/public/common/bindings_policy.h" |
| 48 #include "content/public/common/page_transition_types.h" | 48 #include "content/public/common/page_transition_types.h" |
| 49 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
| 50 | 50 |
| 51 typedef std::vector<DevToolsWindow*> DevToolsWindowList; | 51 typedef std::vector<DevToolsWindow*> DevToolsWindowList; |
| 52 namespace { | 52 namespace { |
| 53 base::LazyInstance<DevToolsWindowList, | 53 base::LazyInstance<DevToolsWindowList>::Leaky |
| 54 base::LeakyLazyInstanceTraits<DevToolsWindowList> > | |
| 55 g_instances = LAZY_INSTANCE_INITIALIZER; | 54 g_instances = LAZY_INSTANCE_INITIALIZER; |
| 56 } // namespace | 55 } // namespace |
| 57 | 56 |
| 58 using content::DevToolsAgentHost; | 57 using content::DevToolsAgentHost; |
| 59 using content::DevToolsAgentHostRegistry; | 58 using content::DevToolsAgentHostRegistry; |
| 60 using content::DevToolsClientHost; | 59 using content::DevToolsClientHost; |
| 61 using content::DevToolsManager; | 60 using content::DevToolsManager; |
| 62 using content::NavigationController; | 61 using content::NavigationController; |
| 63 using content::NavigationEntry; | 62 using content::NavigationEntry; |
| 64 using content::OpenURLParams; | 63 using content::OpenURLParams; |
| (...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 743 content); | 742 content); |
| 744 } | 743 } |
| 745 | 744 |
| 746 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | 745 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
| 747 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { | 746 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { |
| 748 return inspected_tab_->web_contents()->GetDelegate()-> | 747 return inspected_tab_->web_contents()->GetDelegate()-> |
| 749 GetJavaScriptDialogCreator(); | 748 GetJavaScriptDialogCreator(); |
| 750 } | 749 } |
| 751 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); | 750 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); |
| 752 } | 751 } |
| OLD | NEW |