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

Side by Side Diff: chrome/browser/extensions/navigation_observer.cc

Issue 2561983002: NavigationController: Reload methods migration (Closed)
Patch Set: merge master 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/extensions/navigation_observer.h" 5 #include "chrome/browser/extensions/navigation_observer.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "content/public/browser/navigation_controller.h" 10 #include "content/public/browser/navigation_controller.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 in_progress_prompt_extension_id_, true); 104 in_progress_prompt_extension_id_, true);
105 CHECK(extension); 105 CHECK(extension);
106 106
107 if (result == ExtensionInstallPrompt::Result::ACCEPTED) { 107 if (result == ExtensionInstallPrompt::Result::ACCEPTED) {
108 NavigationController* nav_controller = 108 NavigationController* nav_controller =
109 in_progress_prompt_navigation_controller_; 109 in_progress_prompt_navigation_controller_;
110 CHECK(nav_controller); 110 CHECK(nav_controller);
111 111
112 // Grant permissions, re-enable the extension, and then reload the tab. 112 // Grant permissions, re-enable the extension, and then reload the tab.
113 extension_service->GrantPermissionsAndEnableExtension(extension); 113 extension_service->GrantPermissionsAndEnableExtension(extension);
114 nav_controller->Reload(true); 114 nav_controller->Reload(content::ReloadType::NORMAL, true);
115 } else { 115 } else {
116 std::string histogram_name = 116 std::string histogram_name =
117 result == ExtensionInstallPrompt::Result::USER_CANCELED 117 result == ExtensionInstallPrompt::Result::USER_CANCELED
118 ? "ReEnableCancel" 118 ? "ReEnableCancel"
119 : "ReEnableAbort"; 119 : "ReEnableAbort";
120 ExtensionService::RecordPermissionMessagesHistogram(extension, 120 ExtensionService::RecordPermissionMessagesHistogram(extension,
121 histogram_name.c_str()); 121 histogram_name.c_str());
122 } 122 }
123 123
124 in_progress_prompt_extension_id_ = std::string(); 124 in_progress_prompt_extension_id_ = std::string();
125 in_progress_prompt_navigation_controller_ = nullptr; 125 in_progress_prompt_navigation_controller_ = nullptr;
126 extension_install_prompt_.reset(); 126 extension_install_prompt_.reset();
127 } 127 }
128 128
129 void NavigationObserver::OnExtensionUninstalled( 129 void NavigationObserver::OnExtensionUninstalled(
130 content::BrowserContext* browser_context, 130 content::BrowserContext* browser_context,
131 const Extension* extension, 131 const Extension* extension,
132 UninstallReason reason) { 132 UninstallReason reason) {
133 if (in_progress_prompt_extension_id_.empty() || 133 if (in_progress_prompt_extension_id_.empty() ||
134 in_progress_prompt_extension_id_ != extension->id()) { 134 in_progress_prompt_extension_id_ != extension->id()) {
135 return; 135 return;
136 } 136 }
137 137
138 in_progress_prompt_extension_id_ = std::string(); 138 in_progress_prompt_extension_id_ = std::string();
139 in_progress_prompt_navigation_controller_ = nullptr; 139 in_progress_prompt_navigation_controller_ = nullptr;
140 extension_install_prompt_.reset(); 140 extension_install_prompt_.reset();
141 } 141 }
142 142
143 } // namespace extensions 143 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_action_runner_browsertest.cc ('k') | chrome/browser/gpu/three_d_api_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698