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

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

Issue 2529083002: Make extensions developer mode adhere to policy (Closed)
Patch Set: Guard against Preference not being found Created 4 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 "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_INACTIVE)); 269 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_INACTIVE));
270 source->AddString("extensionCommandsStartTyping", 270 source->AddString("extensionCommandsStartTyping",
271 l10n_util::GetStringUTF16(IDS_EXTENSION_TYPE_SHORTCUT)); 271 l10n_util::GetStringUTF16(IDS_EXTENSION_TYPE_SHORTCUT));
272 source->AddString("extensionCommandsDelete", 272 source->AddString("extensionCommandsDelete",
273 l10n_util::GetStringUTF16(IDS_EXTENSION_DELETE_SHORTCUT)); 273 l10n_util::GetStringUTF16(IDS_EXTENSION_DELETE_SHORTCUT));
274 source->AddString("extensionCommandsGlobal", 274 source->AddString("extensionCommandsGlobal",
275 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GLOBAL)); 275 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GLOBAL));
276 source->AddString("extensionCommandsRegular", 276 source->AddString("extensionCommandsRegular",
277 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL)); 277 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL));
278 source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK)); 278 source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK));
279
280 // 'Bubble' text for the controlled-setting-indicator
281 source->AddString("controlledSettingPolicy",
Devlin 2016/11/28 17:34:01 prefix this with 'extensions' like the others. The
pmarko 2016/11/29 12:40:22 Done.
282 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
279 } 283 }
280 284
281 void ExtensionSettingsHandler::DidStartNavigationToPendingEntry( 285 void ExtensionSettingsHandler::DidStartNavigationToPendingEntry(
282 const GURL& url, 286 const GURL& url,
283 content::ReloadType reload_type) { 287 content::ReloadType reload_type) {
284 if (reload_type != content::ReloadType::NONE) 288 if (reload_type != content::ReloadType::NONE)
285 ReloadUnpackedExtensions(); 289 ReloadUnpackedExtensions();
286 } 290 }
287 291
288 void ExtensionSettingsHandler::RegisterMessages() { 292 void ExtensionSettingsHandler::RegisterMessages() {
(...skipping 18 matching lines...) Expand all
307 unpacked_extensions.push_back(extension.get()); 311 unpacked_extensions.push_back(extension.get());
308 } 312 }
309 313
310 for (std::vector<const Extension*>::iterator iter = 314 for (std::vector<const Extension*>::iterator iter =
311 unpacked_extensions.begin(); iter != unpacked_extensions.end(); ++iter) { 315 unpacked_extensions.begin(); iter != unpacked_extensions.end(); ++iter) {
312 extension_service_->ReloadExtensionWithQuietFailure((*iter)->id()); 316 extension_service_->ReloadExtensionWithQuietFailure((*iter)->id());
313 } 317 }
314 } 318 }
315 319
316 } // namespace extensions 320 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698