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

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

Issue 84063003: Rename WebContentsObserver::NavigateToPendingEntry to DidStartNavigationToPendingEntry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding better comment from Charlie. Created 7 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 | 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 "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/app_restore_service.h" 8 #include "apps/app_restore_service.h"
9 #include "apps/saved_files_service.h" 9 #include "apps/saved_files_service.h"
10 #include "apps/shell_window.h" 10 #include "apps/shell_window.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 void ExtensionSettingsHandler::RenderViewDeleted( 450 void ExtensionSettingsHandler::RenderViewDeleted(
451 RenderViewHost* render_view_host) { 451 RenderViewHost* render_view_host) {
452 deleting_rvh_ = render_view_host; 452 deleting_rvh_ = render_view_host;
453 Profile* source_profile = Profile::FromBrowserContext( 453 Profile* source_profile = Profile::FromBrowserContext(
454 render_view_host->GetSiteInstance()->GetBrowserContext()); 454 render_view_host->GetSiteInstance()->GetBrowserContext());
455 if (!Profile::FromWebUI(web_ui())->IsSameProfile(source_profile)) 455 if (!Profile::FromWebUI(web_ui())->IsSameProfile(source_profile))
456 return; 456 return;
457 MaybeUpdateAfterNotification(); 457 MaybeUpdateAfterNotification();
458 } 458 }
459 459
460 void ExtensionSettingsHandler::NavigateToPendingEntry(const GURL& url, 460 void ExtensionSettingsHandler::DidStartNavigationToPendingEntry(
461 const GURL& url,
461 content::NavigationController::ReloadType reload_type) { 462 content::NavigationController::ReloadType reload_type) {
462 if (reload_type != content::NavigationController::NO_RELOAD) 463 if (reload_type != content::NavigationController::NO_RELOAD)
463 ReloadUnpackedExtensions(); 464 ReloadUnpackedExtensions();
464 } 465 }
465 466
466 void ExtensionSettingsHandler::RegisterMessages() { 467 void ExtensionSettingsHandler::RegisterMessages() {
467 // Don't override an |extension_service_| or |management_policy_| injected 468 // Don't override an |extension_service_| or |management_policy_| injected
468 // for testing. 469 // for testing.
469 if (!extension_service_) { 470 if (!extension_service_) {
470 extension_service_ = Profile::FromWebUI(web_ui())->GetOriginalProfile()-> 471 extension_service_ = Profile::FromWebUI(web_ui())->GetOriginalProfile()->
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 extension_service_->EnableExtension(extension_id); 1219 extension_service_->EnableExtension(extension_id);
1219 } else { 1220 } else {
1220 ExtensionErrorReporter::GetInstance()->ReportError( 1221 ExtensionErrorReporter::GetInstance()->ReportError(
1221 UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1222 UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1222 true /* be noisy */); 1223 true /* be noisy */);
1223 } 1224 }
1224 requirements_checker_.reset(); 1225 requirements_checker_.reset();
1225 } 1226 }
1226 1227
1227 } // namespace extensions 1228 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698