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

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

Issue 1878153002: Revert of Simplify BrowserContext by removing redundant methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/extension_reenabler.h" 5 #include "chrome/browser/extensions/extension_reenabler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/webstore_data_fetcher.h" 10 #include "chrome/browser/extensions/webstore_data_fetcher.h"
11 #include "chrome/browser/extensions/webstore_inline_installer.h" 11 #include "chrome/browser/extensions/webstore_inline_installer.h"
12 #include "content/public/browser/browser_context.h" 12 #include "content/public/browser/browser_context.h"
13 #include "content/public/browser/storage_partition.h"
14 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
15 #include "extensions/browser/extension_prefs.h" 14 #include "extensions/browser/extension_prefs.h"
16 #include "extensions/browser/extension_registry.h" 15 #include "extensions/browser/extension_registry.h"
17 #include "extensions/browser/extension_system.h" 16 #include "extensions/browser/extension_system.h"
18 #include "extensions/common/extension.h" 17 #include "extensions/common/extension.h"
19 18
20 namespace extensions { 19 namespace extensions {
21 20
22 ExtensionReenabler::~ExtensionReenabler() { 21 ExtensionReenabler::~ExtensionReenabler() {
23 if (!finished_) 22 if (!finished_)
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 DCHECK(extension_.get()); 76 DCHECK(extension_.get());
78 registry_observer_.Add(ExtensionRegistry::Get(browser_context_)); 77 registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
79 78
80 install_prompt_.reset(new ExtensionInstallPrompt(web_contents)); 79 install_prompt_.reset(new ExtensionInstallPrompt(web_contents));
81 80
82 // If we have a non-empty referrer, then we have to validate that it's a valid 81 // If we have a non-empty referrer, then we have to validate that it's a valid
83 // url for the extension. 82 // url for the extension.
84 if (!referrer_url_.is_empty()) { 83 if (!referrer_url_.is_empty()) {
85 webstore_data_fetcher_.reset(new WebstoreDataFetcher( 84 webstore_data_fetcher_.reset(new WebstoreDataFetcher(
86 this, 85 this,
87 content::BrowserContext::GetDefaultStoragePartition(browser_context_)-> 86 browser_context_->GetRequestContext(),
88 GetURLRequestContext(),
89 referrer_url_, 87 referrer_url_,
90 extension->id())); 88 extension->id()));
91 webstore_data_fetcher_->Start(); 89 webstore_data_fetcher_->Start();
92 } else { 90 } else {
93 ExtensionInstallPrompt::PromptType type = 91 ExtensionInstallPrompt::PromptType type =
94 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension( 92 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension(
95 browser_context, extension.get()); 93 browser_context, extension.get());
96 install_prompt_->ShowDialog( 94 install_prompt_->ShowDialog(
97 base::Bind(&ExtensionReenabler::OnInstallPromptDone, 95 base::Bind(&ExtensionReenabler::OnInstallPromptDone,
98 weak_factory_.GetWeakPtr()), 96 weak_factory_.GetWeakPtr()),
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 } 182 }
185 183
186 void ExtensionReenabler::Finish(ReenableResult result) { 184 void ExtensionReenabler::Finish(ReenableResult result) {
187 DCHECK(!finished_); 185 DCHECK(!finished_);
188 finished_ = true; 186 finished_ = true;
189 registry_observer_.RemoveAll(); 187 registry_observer_.RemoveAll();
190 callback_.Run(result); 188 callback_.Run(result);
191 } 189 }
192 190
193 } // namespace extensions 191 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698