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

Side by Side Diff: chrome/browser/devtools/devtools_ui_bindings.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/devtools/devtools_ui_bindings.h" 5 #include "chrome/browser/devtools/devtools_ui_bindings.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chrome_page_zoom.h" 16 #include "chrome/browser/chrome_page_zoom.h"
17 #include "chrome/browser/devtools/devtools_target_impl.h" 17 #include "chrome/browser/devtools/devtools_target_impl.h"
18 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 18 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
19 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/infobars/infobar_service.h" 19 #include "chrome/browser/infobars/infobar_service.h"
21 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/themes/theme_properties.h" 21 #include "chrome/browser/themes/theme_properties.h"
23 #include "chrome/browser/themes/theme_service.h" 22 #include "chrome/browser/themes/theme_service.h"
24 #include "chrome/browser/themes/theme_service_factory.h" 23 #include "chrome/browser/themes/theme_service_factory.h"
25 #include "chrome/browser/ui/browser.h" 24 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_iterator.h" 25 #include "chrome/browser/ui/browser_iterator.h"
27 #include "chrome/browser/ui/browser_list.h" 26 #include "chrome/browser/ui/browser_list.h"
28 #include "chrome/browser/ui/browser_window.h" 27 #include "chrome/browser/ui/browser_window.h"
29 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
30 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
31 #include "chrome/common/extensions/chrome_manifest_url_handlers.h" 30 #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
32 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
33 #include "chrome/grit/generated_resources.h" 32 #include "chrome/grit/generated_resources.h"
34 #include "components/infobars/core/confirm_infobar_delegate.h" 33 #include "components/infobars/core/confirm_infobar_delegate.h"
35 #include "components/infobars/core/infobar.h" 34 #include "components/infobars/core/infobar.h"
36 #include "content/public/browser/favicon_status.h" 35 #include "content/public/browser/favicon_status.h"
37 #include "content/public/browser/invalidate_type.h" 36 #include "content/public/browser/invalidate_type.h"
38 #include "content/public/browser/navigation_controller.h" 37 #include "content/public/browser/navigation_controller.h"
39 #include "content/public/browser/navigation_entry.h" 38 #include "content/public/browser/navigation_entry.h"
40 #include "content/public/browser/notification_source.h" 39 #include "content/public/browser/notification_source.h"
41 #include "content/public/browser/render_frame_host.h" 40 #include "content/public/browser/render_frame_host.h"
42 #include "content/public/browser/render_view_host.h" 41 #include "content/public/browser/render_view_host.h"
43 #include "content/public/browser/user_metrics.h" 42 #include "content/public/browser/user_metrics.h"
44 #include "content/public/browser/web_contents.h" 43 #include "content/public/browser/web_contents.h"
45 #include "content/public/browser/web_contents_observer.h" 44 #include "content/public/browser/web_contents_observer.h"
46 #include "content/public/common/renderer_preferences.h" 45 #include "content/public/common/renderer_preferences.h"
47 #include "content/public/common/url_constants.h" 46 #include "content/public/common/url_constants.h"
48 #include "extensions/browser/extension_system.h" 47 #include "extensions/browser/extension_registry.h"
49 #include "extensions/common/extension_set.h"
50 #include "extensions/common/permissions/permissions_data.h" 48 #include "extensions/common/permissions/permissions_data.h"
51 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
52 #include "ui/base/page_transition_types.h" 50 #include "ui/base/page_transition_types.h"
53 51
54 using base::DictionaryValue; 52 using base::DictionaryValue;
55 using content::BrowserThread; 53 using content::BrowserThread;
56 54
57 namespace content { 55 namespace content {
58 struct LoadCommittedDetails; 56 struct LoadCommittedDetails;
59 struct FrameNavigateParams; 57 struct FrameNavigateParams;
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 787
790 std::string command("InspectorFrontendAPI.setToolbarColors(\"" + 788 std::string command("InspectorFrontendAPI.setToolbarColors(\"" +
791 SkColorToRGBAString(tp->GetColor(ThemeProperties::COLOR_TOOLBAR)) + 789 SkColorToRGBAString(tp->GetColor(ThemeProperties::COLOR_TOOLBAR)) +
792 "\", \"" + 790 "\", \"" +
793 SkColorToRGBAString(tp->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT)) + 791 SkColorToRGBAString(tp->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT)) +
794 "\")"); 792 "\")");
795 web_contents_->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(command)); 793 web_contents_->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16(command));
796 } 794 }
797 795
798 void DevToolsUIBindings::AddDevToolsExtensionsToClient() { 796 void DevToolsUIBindings::AddDevToolsExtensionsToClient() {
799 const ExtensionService* extension_service = extensions::ExtensionSystem::Get( 797 const extensions::ExtensionRegistry* registry =
800 profile_->GetOriginalProfile())->extension_service(); 798 extensions::ExtensionRegistry::Get(profile_->GetOriginalProfile());
801 if (!extension_service) 799 if (!registry)
802 return; 800 return;
803 const extensions::ExtensionSet* extensions = extension_service->extensions();
804 801
805 base::ListValue results; 802 base::ListValue results;
806 for (extensions::ExtensionSet::const_iterator extension(extensions->begin()); 803 for (const scoped_refptr<const extensions::Extension>& extension :
807 extension != extensions->end(); ++extension) { 804 registry->enabled_extensions()) {
808 if (extensions::chrome_manifest_urls::GetDevToolsPage(extension->get()) 805 if (extensions::chrome_manifest_urls::GetDevToolsPage(extension.get())
809 .is_empty()) 806 .is_empty())
810 continue; 807 continue;
811 base::DictionaryValue* extension_info = new base::DictionaryValue(); 808 base::DictionaryValue* extension_info = new base::DictionaryValue();
812 extension_info->Set( 809 extension_info->Set(
813 "startPage", 810 "startPage",
814 new base::StringValue(extensions::chrome_manifest_urls::GetDevToolsPage( 811 new base::StringValue(extensions::chrome_manifest_urls::GetDevToolsPage(
815 extension->get()).spec())); 812 extension.get()).spec()));
816 extension_info->Set("name", new base::StringValue((*extension)->name())); 813 extension_info->Set("name", new base::StringValue(extension->name()));
817 extension_info->Set("exposeExperimentalAPIs", 814 extension_info->Set("exposeExperimentalAPIs",
818 new base::FundamentalValue( 815 new base::FundamentalValue(
819 (*extension)->permissions_data()->HasAPIPermission( 816 extension->permissions_data()->HasAPIPermission(
820 extensions::APIPermission::kExperimental))); 817 extensions::APIPermission::kExperimental)));
821 results.Append(extension_info); 818 results.Append(extension_info);
822 } 819 }
823 CallClientFunction("WebInspector.addExtensions", &results, NULL, NULL); 820 CallClientFunction("WebInspector.addExtensions", &results, NULL, NULL);
824 } 821 }
825 822
826 void DevToolsUIBindings::SetDelegate(Delegate* delegate) { 823 void DevToolsUIBindings::SetDelegate(Delegate* delegate) {
827 delegate_.reset(delegate); 824 delegate_.reset(delegate);
828 } 825 }
829 826
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 if (frontend_loaded_) 889 if (frontend_loaded_)
893 return; 890 return;
894 frontend_loaded_ = true; 891 frontend_loaded_ = true;
895 892
896 // Call delegate first - it seeds importants bit of information. 893 // Call delegate first - it seeds importants bit of information.
897 delegate_->OnLoadCompleted(); 894 delegate_->OnLoadCompleted();
898 895
899 UpdateTheme(); 896 UpdateTheme();
900 AddDevToolsExtensionsToClient(); 897 AddDevToolsExtensionsToClient();
901 } 898 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_sanity_browsertest.cc ('k') | chrome/browser/extensions/all_urls_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698