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

Side by Side Diff: chrome/browser/ui/extensions/extension_enable_flow.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 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 | 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/extensions/extension_enable_flow.h" 5 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.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 "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 void ExtensionEnableFlow::CheckPermissionAndMaybePromptUser() { 79 void ExtensionEnableFlow::CheckPermissionAndMaybePromptUser() {
80 ExtensionService* service = 80 ExtensionService* service =
81 extensions::ExtensionSystem::Get(profile_)->extension_service(); 81 extensions::ExtensionSystem::Get(profile_)->extension_service();
82 const Extension* extension = service->GetExtensionById(extension_id_, true); 82 const Extension* extension = service->GetExtensionById(extension_id_, true);
83 if (!extension) { 83 if (!extension) {
84 delegate_->ExtensionEnableFlowAborted(false); // |delegate_| may delete us. 84 delegate_->ExtensionEnableFlowAborted(false); // |delegate_| may delete us.
85 return; 85 return;
86 } 86 }
87 87
88 extensions::ExtensionPrefs* extension_prefs = service->extension_prefs(); 88 extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
89 if (!extension_prefs->DidExtensionEscalatePermissions(extension_id_)) { 89 if (!prefs->DidExtensionEscalatePermissions(extension_id_)) {
90 // Enable the extension immediately if its privileges weren't escalated. 90 // Enable the extension immediately if its privileges weren't escalated.
91 // This is a no-op if the extension was previously terminated. 91 // This is a no-op if the extension was previously terminated.
92 service->EnableExtension(extension_id_); 92 service->EnableExtension(extension_id_);
93 93
94 delegate_->ExtensionEnableFlowFinished(); // |delegate_| may delete us. 94 delegate_->ExtensionEnableFlowFinished(); // |delegate_| may delete us.
95 return; 95 return;
96 } 96 }
97 97
98 CreatePrompt(); 98 CreatePrompt();
99 prompt_->ConfirmReEnable(this, extension); 99 prompt_->ConfirmReEnable(this, extension);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 delegate_->ExtensionEnableFlowAborted(user_initiated); 174 delegate_->ExtensionEnableFlowAborted(user_initiated);
175 // |delegate_| may delete us. 175 // |delegate_| may delete us.
176 } 176 }
177 177
178 content::WebContents* ExtensionEnableFlow::OpenURL( 178 content::WebContents* ExtensionEnableFlow::OpenURL(
179 const content::OpenURLParams& params) { 179 const content::OpenURLParams& params) {
180 chrome::ScopedTabbedBrowserDisplayer displayer( 180 chrome::ScopedTabbedBrowserDisplayer displayer(
181 profile_, chrome::GetActiveDesktop()); 181 profile_, chrome::GetActiveDesktop());
182 return displayer.browser()->OpenURL(params); 182 return displayer.browser()->OpenURL(params);
183 } 183 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/application_launch.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698