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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 months 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 | Annotate | Revision Log
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 "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/prefs/pref_service.h" 30 #include "chrome/browser/prefs/pref_service.h"
31 #include "chrome/browser/profiles/profile.h" 31 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/browser/tab_contents/background_contents.h" 32 #include "chrome/browser/tab_contents/background_contents.h"
33 #include "chrome/browser/ui/browser_finder.h" 33 #include "chrome/browser/ui/browser_finder.h"
34 #include "chrome/browser/ui/chrome_select_file_policy.h" 34 #include "chrome/browser/ui/chrome_select_file_policy.h"
35 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 35 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
36 #include "chrome/browser/view_type_utils.h" 36 #include "chrome/browser/view_type_utils.h"
37 #include "chrome/common/chrome_notification_types.h" 37 #include "chrome/common/chrome_notification_types.h"
38 #include "chrome/common/chrome_switches.h" 38 #include "chrome/common/chrome_switches.h"
39 #include "chrome/common/extensions/extension.h" 39 #include "chrome/common/extensions/extension.h"
40 #include "chrome/common/extensions/extension_constants.h"
40 #include "chrome/common/extensions/extension_icon_set.h" 41 #include "chrome/common/extensions/extension_icon_set.h"
41 #include "chrome/common/extensions/extension_set.h" 42 #include "chrome/common/extensions/extension_set.h"
42 #include "chrome/common/pref_names.h" 43 #include "chrome/common/pref_names.h"
43 #include "chrome/common/url_constants.h" 44 #include "chrome/common/url_constants.h"
44 #include "content/public/browser/notification_service.h" 45 #include "content/public/browser/notification_service.h"
45 #include "content/public/browser/notification_source.h" 46 #include "content/public/browser/notification_source.h"
46 #include "content/public/browser/notification_types.h" 47 #include "content/public/browser/notification_types.h"
47 #include "content/public/browser/render_process_host.h" 48 #include "content/public/browser/render_process_host.h"
48 #include "content/public/browser/render_view_host.h" 49 #include "content/public/browser/render_view_host.h"
49 #include "content/public/browser/site_instance.h" 50 #include "content/public/browser/site_instance.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 const ExtensionWarningSet* warnings_set) { 109 const ExtensionWarningSet* warnings_set) {
109 DictionaryValue* extension_data = new DictionaryValue(); 110 DictionaryValue* extension_data = new DictionaryValue();
110 bool enabled = extension_service_->IsExtensionEnabled(extension->id()); 111 bool enabled = extension_service_->IsExtensionEnabled(extension->id());
111 extension->GetBasicInfo(enabled, extension_data); 112 extension->GetBasicInfo(enabled, extension_data);
112 113
113 extension_data->SetBoolean("userModifiable", 114 extension_data->SetBoolean("userModifiable",
114 management_policy_->UserMayModifySettings(extension, NULL)); 115 management_policy_->UserMayModifySettings(extension, NULL));
115 116
116 GURL icon = 117 GURL icon =
117 ExtensionIconSource::GetIconURL(extension, 118 ExtensionIconSource::GetIconURL(extension,
118 ExtensionIconSet::EXTENSION_ICON_MEDIUM, 119 extension_misc::EXTENSION_ICON_MEDIUM,
119 ExtensionIconSet::MATCH_BIGGER, 120 ExtensionIconSet::MATCH_BIGGER,
120 !enabled, NULL); 121 !enabled, NULL);
121 if (extension->location() == Extension::LOAD) 122 if (extension->location() == Extension::LOAD)
122 extension_data->SetString("path", extension->path().value()); 123 extension_data->SetString("path", extension->path().value());
123 extension_data->SetString("icon", icon.spec()); 124 extension_data->SetString("icon", icon.spec());
124 extension_data->SetBoolean("isUnpacked", 125 extension_data->SetBoolean("isUnpacked",
125 extension->location() == Extension::LOAD); 126 extension->location() == Extension::LOAD);
126 extension_data->SetBoolean("terminated", 127 extension_data->SetBoolean("terminated",
127 extension_service_->terminated_extensions()->Contains(extension->id())); 128 extension_service_->terminated_extensions()->Contains(extension->id()));
128 extension_data->SetBoolean("enabledIncognito", 129 extension_data->SetBoolean("enabledIncognito",
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 #else 880 #else
880 return NULL; 881 return NULL;
881 #endif // !defined(OS_ANDROID) 882 #endif // !defined(OS_ANDROID)
882 } 883 }
883 884
884 void ExtensionSettingsHandler::InspectExtensionHost( 885 void ExtensionSettingsHandler::InspectExtensionHost(
885 extensions::ExtensionHost* host) { 886 extensions::ExtensionHost* host) {
886 if (host) 887 if (host)
887 DevToolsWindow::OpenDevToolsWindow(host->render_view_host()); 888 DevToolsWindow::OpenDevToolsWindow(host->render_view_host());
888 } 889 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_info_ui.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698