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

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

Issue 9705083: Unknown options in extension manifest file are silently ignored (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Changes per comments Created 8 years, 7 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
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 17 matching lines...) Expand all
28 #include "chrome/browser/prefs/pref_service.h" 28 #include "chrome/browser/prefs/pref_service.h"
29 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/tab_contents/background_contents.h" 30 #include "chrome/browser/tab_contents/background_contents.h"
31 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 31 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
32 #include "chrome/common/chrome_notification_types.h" 32 #include "chrome/common/chrome_notification_types.h"
33 #include "chrome/common/chrome_switches.h" 33 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/chrome_view_type.h" 34 #include "chrome/common/chrome_view_type.h"
35 #include "chrome/common/extensions/extension.h" 35 #include "chrome/common/extensions/extension.h"
36 #include "chrome/common/extensions/extension_icon_set.h" 36 #include "chrome/common/extensions/extension_icon_set.h"
37 #include "chrome/common/extensions/extension_set.h" 37 #include "chrome/common/extensions/extension_set.h"
38 #include "chrome/common/extensions/manifest.h"
38 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
39 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
40 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
41 #include "content/public/browser/notification_source.h" 42 #include "content/public/browser/notification_source.h"
42 #include "content/public/browser/notification_types.h" 43 #include "content/public/browser/notification_types.h"
43 #include "content/public/browser/render_process_host.h" 44 #include "content/public/browser/render_process_host.h"
44 #include "content/public/browser/render_view_host.h" 45 #include "content/public/browser/render_view_host.h"
45 #include "content/public/browser/site_instance.h" 46 #include "content/public/browser/site_instance.h"
46 #include "content/public/browser/web_contents.h" 47 #include "content/public/browser/web_contents.h"
47 #include "content/public/browser/web_contents_view.h" 48 #include "content/public/browser/web_contents_view.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 extension->install_warnings(); 208 extension->install_warnings();
208 if (!install_warnings.empty()) { 209 if (!install_warnings.empty()) {
209 scoped_ptr<ListValue> list(new ListValue()); 210 scoped_ptr<ListValue> list(new ListValue());
210 for (std::vector<std::string>::const_iterator it = install_warnings.begin(); 211 for (std::vector<std::string>::const_iterator it = install_warnings.begin();
211 it != install_warnings.end(); ++it) { 212 it != install_warnings.end(); ++it) {
212 list->Append(Value::CreateStringValue(*it)); 213 list->Append(Value::CreateStringValue(*it));
213 } 214 }
214 extension_data->Set("installWarnings", list.release()); 215 extension_data->Set("installWarnings", list.release());
215 } 216 }
216 217
218 // Add unrecognized manifest keys.
219 const std::vector<std::string> unrecognized_keys =
220 extension->manifest()->GetUnrecognizedKeys();
221 if (!unrecognized_keys.empty()) {
222 scoped_ptr<ListValue> list(new ListValue());
223 std::vector<std::string>::const_iterator it;
224 for (it = unrecognized_keys.begin(); it != unrecognized_keys.end(); ++it)
225 list->Append(Value::CreateStringValue(*it));
226 extension_data->Set("unrecognizedKeys", list.release());
227 }
228
217 return extension_data; 229 return extension_data;
218 } 230 }
219 231
220 void ExtensionSettingsHandler::GetLocalizedValues( 232 void ExtensionSettingsHandler::GetLocalizedValues(
221 DictionaryValue* localized_strings) { 233 DictionaryValue* localized_strings) {
222 localized_strings->SetString("extensionSettings", 234 localized_strings->SetString("extensionSettings",
223 l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE)); 235 l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE));
224 236
225 localized_strings->SetString("extensionSettingsDeveloperMode", 237 localized_strings->SetString("extensionSettingsDeveloperMode",
226 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEVELOPER_MODE_LINK)); 238 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEVELOPER_MODE_LINK));
(...skipping 13 matching lines...) Expand all
240 ASCIIToUTF16(google_util::AppendGoogleLocaleParam( 252 ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
241 GURL(extension_urls::GetWebstoreLaunchURL())).spec())); 253 GURL(extension_urls::GetWebstoreLaunchURL())).spec()));
242 localized_strings->SetString("extensionSettingsExtensionId", 254 localized_strings->SetString("extensionSettingsExtensionId",
243 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ID)); 255 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ID));
244 localized_strings->SetString("extensionSettingsExtensionPath", 256 localized_strings->SetString("extensionSettingsExtensionPath",
245 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PATH)); 257 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PATH));
246 localized_strings->SetString("extensionSettingsInspectViews", 258 localized_strings->SetString("extensionSettingsInspectViews",
247 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSPECT_VIEWS)); 259 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSPECT_VIEWS));
248 localized_strings->SetString("extensionSettingsInstallWarnings", 260 localized_strings->SetString("extensionSettingsInstallWarnings",
249 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALL_WARNINGS)); 261 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALL_WARNINGS));
262 localized_strings->SetString("extensionSettingsUnrecognizedManifestKeys",
263 l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNRECOGNIZED_MANIFEST_KEYS));
250 localized_strings->SetString("viewIncognito", 264 localized_strings->SetString("viewIncognito",
251 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INCOGNITO)); 265 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INCOGNITO));
252 localized_strings->SetString("viewInactive", 266 localized_strings->SetString("viewInactive",
253 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INACTIVE)); 267 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VIEW_INACTIVE));
254 localized_strings->SetString("extensionSettingsEnable", 268 localized_strings->SetString("extensionSettingsEnable",
255 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ENABLE)); 269 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ENABLE));
256 localized_strings->SetString("extensionSettingsEnabled", 270 localized_strings->SetString("extensionSettingsEnabled",
257 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ENABLED)); 271 l10n_util::GetStringUTF16(IDS_EXTENSIONS_ENABLED));
258 localized_strings->SetString("extensionSettingsRemove", 272 localized_strings->SetString("extensionSettingsRemove",
259 l10n_util::GetStringUTF16(IDS_EXTENSIONS_REMOVE)); 273 l10n_util::GetStringUTF16(IDS_EXTENSIONS_REMOVE));
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 return extension_uninstall_dialog_.get(); 855 return extension_uninstall_dialog_.get();
842 #else 856 #else
843 return NULL; 857 return NULL;
844 #endif // !defined(OS_ANDROID) 858 #endif // !defined(OS_ANDROID)
845 } 859 }
846 860
847 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) { 861 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) {
848 if (host) 862 if (host)
849 DevToolsWindow::OpenDevToolsWindow(host->render_view_host()); 863 DevToolsWindow::OpenDevToolsWindow(host->render_view_host());
850 } 864 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698