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

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

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 years 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
OLDNEW
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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 void DevToolsWindow::AddDevToolsExtensionsToClient() { 449 void DevToolsWindow::AddDevToolsExtensionsToClient() {
449 if (inspected_web_contents_) { 450 if (inspected_web_contents_) {
450 SessionTabHelper* session_tab_helper = 451 SessionTabHelper* session_tab_helper =
451 SessionTabHelper::FromWebContents(inspected_web_contents_); 452 SessionTabHelper::FromWebContents(inspected_web_contents_);
452 if (session_tab_helper) { 453 if (session_tab_helper) {
453 base::FundamentalValue tabId(session_tab_helper->session_id().id()); 454 base::FundamentalValue tabId(session_tab_helper->session_id().id());
454 CallClientFunction("WebInspector.setInspectedTabId", &tabId); 455 CallClientFunction("WebInspector.setInspectedTabId", &tabId);
455 } 456 }
456 } 457 }
457 ListValue results; 458 ListValue results;
458 const ExtensionService* extension_service = 459 const ExtensionService* extension_service = extensions::ExtensionSystem::Get(
459 tab_contents_->profile()->GetOriginalProfile()->GetExtensionService(); 460 tab_contents_->profile()->GetOriginalProfile())->extension_service();
460 if (!extension_service) 461 if (!extension_service)
461 return; 462 return;
462 463
463 const ExtensionSet* extensions = extension_service->extensions(); 464 const ExtensionSet* extensions = extension_service->extensions();
464 465
465 for (ExtensionSet::const_iterator extension = extensions->begin(); 466 for (ExtensionSet::const_iterator extension = extensions->begin();
466 extension != extensions->end(); ++extension) { 467 extension != extensions->end(); ++extension) {
467 if ((*extension)->devtools_url().is_empty()) 468 if ((*extension)->devtools_url().is_empty())
468 continue; 469 continue;
469 DictionaryValue* extension_info = new DictionaryValue(); 470 DictionaryValue* extension_info = new DictionaryValue();
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 883
883 // static 884 // static
884 DevToolsDockSide DevToolsWindow::SideFromString( 885 DevToolsDockSide DevToolsWindow::SideFromString(
885 const std::string& dock_side) { 886 const std::string& dock_side) {
886 if (dock_side == kDockSideRight) 887 if (dock_side == kDockSideRight)
887 return DEVTOOLS_DOCK_SIDE_RIGHT; 888 return DEVTOOLS_DOCK_SIDE_RIGHT;
888 if (dock_side == kDockSideBottom) 889 if (dock_side == kDockSideBottom)
889 return DEVTOOLS_DOCK_SIDE_BOTTOM; 890 return DEVTOOLS_DOCK_SIDE_BOTTOM;
890 return DEVTOOLS_DOCK_SIDE_UNDOCKED; 891 return DEVTOOLS_DOCK_SIDE_UNDOCKED;
891 } 892 }
OLDNEW
« no previous file with comments | « chrome/browser/debugger/devtools_sanity_browsertest.cc ('k') | chrome/browser/download/chrome_download_manager_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698