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" |
11 #include "base/stringprintf.h" | 11 #include "base/stringprintf.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/debugger/devtools_window.h" | 15 #include "chrome/browser/debugger/devtools_window.h" |
16 #include "chrome/browser/extensions/api/debugger/debugger_api.h" | 16 #include "chrome/browser/extensions/api/debugger/debugger_api.h" |
17 #include "chrome/browser/extensions/extension_service.h" | 17 #include "chrome/browser/extensions/extension_service.h" |
| 18 #include "chrome/browser/extensions/extension_system.h" |
18 #include "chrome/browser/file_select_helper.h" | 19 #include "chrome/browser/file_select_helper.h" |
19 #include "chrome/browser/prefs/pref_service.h" | 20 #include "chrome/browser/prefs/pref_service.h" |
20 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 21 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
21 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/sessions/session_tab_helper.h" | 23 #include "chrome/browser/sessions/session_tab_helper.h" |
23 #include "chrome/browser/themes/theme_service.h" | 24 #include "chrome/browser/themes/theme_service.h" |
24 #include "chrome/browser/themes/theme_service_factory.h" | 25 #include "chrome/browser/themes/theme_service_factory.h" |
25 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
26 #include "chrome/browser/ui/browser_list.h" | 27 #include "chrome/browser/ui/browser_list.h" |
27 #include "chrome/browser/ui/browser_tabstrip.h" | 28 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 | 458 |
458 | 459 |
459 void DevToolsWindow::AddDevToolsExtensionsToClient() { | 460 void DevToolsWindow::AddDevToolsExtensionsToClient() { |
460 if (inspected_tab_) { | 461 if (inspected_tab_) { |
461 SessionTabHelper* session_tab_helper = | 462 SessionTabHelper* session_tab_helper = |
462 SessionTabHelper::FromWebContents(inspected_tab_->web_contents()); | 463 SessionTabHelper::FromWebContents(inspected_tab_->web_contents()); |
463 base::FundamentalValue tabId(session_tab_helper->session_id().id()); | 464 base::FundamentalValue tabId(session_tab_helper->session_id().id()); |
464 CallClientFunction("WebInspector.setInspectedTabId", &tabId); | 465 CallClientFunction("WebInspector.setInspectedTabId", &tabId); |
465 } | 466 } |
466 ListValue results; | 467 ListValue results; |
467 const ExtensionService* extension_service = | 468 const ExtensionService* extension_service = extensions::ExtensionSystem::Get( |
468 tab_contents_->profile()->GetOriginalProfile()->GetExtensionService(); | 469 tab_contents_->profile()->GetOriginalProfile())->extension_service(); |
469 if (!extension_service) | 470 if (!extension_service) |
470 return; | 471 return; |
471 | 472 |
472 const ExtensionSet* extensions = extension_service->extensions(); | 473 const ExtensionSet* extensions = extension_service->extensions(); |
473 | 474 |
474 for (ExtensionSet::const_iterator extension = extensions->begin(); | 475 for (ExtensionSet::const_iterator extension = extensions->begin(); |
475 extension != extensions->end(); ++extension) { | 476 extension != extensions->end(); ++extension) { |
476 if ((*extension)->devtools_url().is_empty()) | 477 if ((*extension)->devtools_url().is_empty()) |
477 continue; | 478 continue; |
478 DictionaryValue* extension_info = new DictionaryValue(); | 479 DictionaryValue* extension_info = new DictionaryValue(); |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 | 892 |
892 // static | 893 // static |
893 DevToolsDockSide DevToolsWindow::SideFromString( | 894 DevToolsDockSide DevToolsWindow::SideFromString( |
894 const std::string& dock_side) { | 895 const std::string& dock_side) { |
895 if (dock_side == kDockSideRight) | 896 if (dock_side == kDockSideRight) |
896 return DEVTOOLS_DOCK_SIDE_RIGHT; | 897 return DEVTOOLS_DOCK_SIDE_RIGHT; |
897 if (dock_side == kDockSideBottom) | 898 if (dock_side == kDockSideBottom) |
898 return DEVTOOLS_DOCK_SIDE_BOTTOM; | 899 return DEVTOOLS_DOCK_SIDE_BOTTOM; |
899 return DEVTOOLS_DOCK_SIDE_UNDOCKED; | 900 return DEVTOOLS_DOCK_SIDE_UNDOCKED; |
900 } | 901 } |
OLD | NEW |