| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/themes/theme_service_factory.h" | 23 #include "chrome/browser/themes/theme_service_factory.h" |
| 24 #include "chrome/browser/ui/browser.h" | 24 #include "chrome/browser/ui/browser.h" |
| 25 #include "chrome/browser/ui/browser_list.h" | 25 #include "chrome/browser/ui/browser_list.h" |
| 26 #include "chrome/browser/ui/browser_window.h" | 26 #include "chrome/browser/ui/browser_window.h" |
| 27 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 27 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 28 #include "chrome/common/chrome_notification_types.h" | 28 #include "chrome/common/chrome_notification_types.h" |
| 29 #include "chrome/common/pref_names.h" | 29 #include "chrome/common/pref_names.h" |
| 30 #include "chrome/common/render_messages.h" | 30 #include "chrome/common/render_messages.h" |
| 31 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
| 32 #include "content/browser/browsing_instance.h" | 32 #include "content/browser/browsing_instance.h" |
| 33 #include "content/browser/content_browser_client.h" | |
| 34 #include "content/browser/debugger/devtools_manager.h" | 33 #include "content/browser/debugger/devtools_manager.h" |
| 35 #include "content/browser/in_process_webkit/session_storage_namespace.h" | 34 #include "content/browser/in_process_webkit/session_storage_namespace.h" |
| 36 #include "content/browser/load_notification_details.h" | 35 #include "content/browser/load_notification_details.h" |
| 37 #include "content/browser/renderer_host/render_view_host.h" | 36 #include "content/browser/renderer_host/render_view_host.h" |
| 38 #include "content/browser/tab_contents/navigation_controller.h" | 37 #include "content/browser/tab_contents/navigation_controller.h" |
| 39 #include "content/browser/tab_contents/navigation_entry.h" | 38 #include "content/browser/tab_contents/navigation_entry.h" |
| 40 #include "content/browser/tab_contents/tab_contents.h" | 39 #include "content/browser/tab_contents/tab_contents.h" |
| 41 #include "content/browser/tab_contents/tab_contents_view.h" | 40 #include "content/browser/tab_contents/tab_contents_view.h" |
| 42 #include "content/common/devtools_messages.h" | 41 #include "content/common/devtools_messages.h" |
| 43 #include "content/common/notification_service.h" | 42 #include "content/common/notification_service.h" |
| 43 #include "content/public/browser/content_browser_client.h" |
| 44 #include "content/public/common/bindings_policy.h" | 44 #include "content/public/common/bindings_policy.h" |
| 45 #include "grit/generated_resources.h" | 45 #include "grit/generated_resources.h" |
| 46 | 46 |
| 47 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; | 47 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; |
| 48 | 48 |
| 49 // static | 49 // static |
| 50 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) { | 50 void DevToolsWindow::RegisterUserPrefs(PrefService* prefs) { |
| 51 prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, | 51 prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, |
| 52 true, | 52 true, |
| 53 PrefService::UNSYNCABLE_PREF); | 53 PrefService::UNSYNCABLE_PREF); |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 RequestSetDocked(false); | 650 RequestSetDocked(false); |
| 651 } | 651 } |
| 652 | 652 |
| 653 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | 653 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
| 654 if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) { | 654 if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) { |
| 655 return inspected_tab_->tab_contents()->delegate()-> | 655 return inspected_tab_->tab_contents()->delegate()-> |
| 656 GetJavaScriptDialogCreator(); | 656 GetJavaScriptDialogCreator(); |
| 657 } | 657 } |
| 658 return TabContentsDelegate::GetJavaScriptDialogCreator(); | 658 return TabContentsDelegate::GetJavaScriptDialogCreator(); |
| 659 } | 659 } |
| OLD | NEW |