| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 g_instances = LAZY_INSTANCE_INITIALIZER; | 53 g_instances = LAZY_INSTANCE_INITIALIZER; |
| 54 } // namespace | 54 } // namespace |
| 55 | 55 |
| 56 using content::DevToolsAgentHost; | 56 using content::DevToolsAgentHost; |
| 57 using content::DevToolsAgentHostRegistry; | 57 using content::DevToolsAgentHostRegistry; |
| 58 using content::DevToolsClientHost; | 58 using content::DevToolsClientHost; |
| 59 using content::DevToolsManager; | 59 using content::DevToolsManager; |
| 60 using content::NavigationController; | 60 using content::NavigationController; |
| 61 using content::NavigationEntry; | 61 using content::NavigationEntry; |
| 62 using content::OpenURLParams; | 62 using content::OpenURLParams; |
| 63 using content::RenderViewHost; |
| 63 using content::WebContents; | 64 using content::WebContents; |
| 64 | 65 |
| 65 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; | 66 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; |
| 66 | 67 |
| 67 const char kDockSideBottom[] = "bottom"; | 68 const char kDockSideBottom[] = "bottom"; |
| 68 const char kDockSideRight[] = "right"; | 69 const char kDockSideRight[] = "right"; |
| 69 | 70 |
| 70 // static | 71 // static |
| 71 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) { | 72 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) { |
| 72 prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, | 73 prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, |
| (...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 743 content); | 744 content); |
| 744 } | 745 } |
| 745 | 746 |
| 746 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | 747 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
| 747 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { | 748 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { |
| 748 return inspected_tab_->web_contents()->GetDelegate()-> | 749 return inspected_tab_->web_contents()->GetDelegate()-> |
| 749 GetJavaScriptDialogCreator(); | 750 GetJavaScriptDialogCreator(); |
| 750 } | 751 } |
| 751 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); | 752 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); |
| 752 } | 753 } |
| OLD | NEW |