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

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

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [rebase] Created 4 years, 3 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 <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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 l10n_util::GetStringUTF16(IDS_EXTENSION_DELETE_SHORTCUT)); 272 l10n_util::GetStringUTF16(IDS_EXTENSION_DELETE_SHORTCUT));
273 source->AddString("extensionCommandsGlobal", 273 source->AddString("extensionCommandsGlobal",
274 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GLOBAL)); 274 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GLOBAL));
275 source->AddString("extensionCommandsRegular", 275 source->AddString("extensionCommandsRegular",
276 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL)); 276 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL));
277 source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK)); 277 source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK));
278 } 278 }
279 279
280 void ExtensionSettingsHandler::DidStartNavigationToPendingEntry( 280 void ExtensionSettingsHandler::DidStartNavigationToPendingEntry(
281 const GURL& url, 281 const GURL& url,
282 content::NavigationController::ReloadType reload_type) { 282 content::ReloadType reload_type) {
283 if (reload_type != content::NavigationController::NO_RELOAD) 283 if (reload_type != content::ReloadType::NONE)
284 ReloadUnpackedExtensions(); 284 ReloadUnpackedExtensions();
285 } 285 }
286 286
287 void ExtensionSettingsHandler::RegisterMessages() { 287 void ExtensionSettingsHandler::RegisterMessages() {
288 Profile* profile = Profile::FromWebUI(web_ui())->GetOriginalProfile(); 288 Profile* profile = Profile::FromWebUI(web_ui())->GetOriginalProfile();
289 extension_service_ = 289 extension_service_ =
290 extensions::ExtensionSystem::Get(profile)->extension_service(); 290 extensions::ExtensionSystem::Get(profile)->extension_service();
291 // Clear the preference for the ADT Promo before fully removing it. 291 // Clear the preference for the ADT Promo before fully removing it.
292 // TODO(devlin): Take this out when everyone's been updated. 292 // TODO(devlin): Take this out when everyone's been updated.
293 Profile::FromWebUI(web_ui())->GetPrefs()->ClearPref( 293 Profile::FromWebUI(web_ui())->GetPrefs()->ClearPref(
(...skipping 12 matching lines...) Expand all
306 unpacked_extensions.push_back(extension.get()); 306 unpacked_extensions.push_back(extension.get());
307 } 307 }
308 308
309 for (std::vector<const Extension*>::iterator iter = 309 for (std::vector<const Extension*>::iterator iter =
310 unpacked_extensions.begin(); iter != unpacked_extensions.end(); ++iter) { 310 unpacked_extensions.begin(); iter != unpacked_extensions.end(); ++iter) {
311 extension_service_->ReloadExtensionWithQuietFailure((*iter)->id()); 311 extension_service_->ReloadExtensionWithQuietFailure((*iter)->id());
312 } 312 }
313 } 313 }
314 314
315 } // namespace extensions 315 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.h ('k') | components/favicon/content/content_favicon_driver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698