OLD | NEW |
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" |
13 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
14 #include "extensions/browser/extension_prefs.h" | 15 #include "extensions/browser/extension_prefs.h" |
15 #include "extensions/browser/extension_registry.h" | 16 #include "extensions/browser/extension_registry.h" |
16 #include "extensions/browser/extension_system.h" | 17 #include "extensions/browser/extension_system.h" |
17 #include "extensions/common/extension.h" | 18 #include "extensions/common/extension.h" |
18 | 19 |
19 namespace extensions { | 20 namespace extensions { |
20 | 21 |
21 ExtensionReenabler::~ExtensionReenabler() { | 22 ExtensionReenabler::~ExtensionReenabler() { |
22 if (!finished_) | 23 if (!finished_) |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 DCHECK(extension_.get()); | 77 DCHECK(extension_.get()); |
77 registry_observer_.Add(ExtensionRegistry::Get(browser_context_)); | 78 registry_observer_.Add(ExtensionRegistry::Get(browser_context_)); |
78 | 79 |
79 install_prompt_.reset(new ExtensionInstallPrompt(web_contents)); | 80 install_prompt_.reset(new ExtensionInstallPrompt(web_contents)); |
80 | 81 |
81 // If we have a non-empty referrer, then we have to validate that it's a valid | 82 // If we have a non-empty referrer, then we have to validate that it's a valid |
82 // url for the extension. | 83 // url for the extension. |
83 if (!referrer_url_.is_empty()) { | 84 if (!referrer_url_.is_empty()) { |
84 webstore_data_fetcher_.reset(new WebstoreDataFetcher( | 85 webstore_data_fetcher_.reset(new WebstoreDataFetcher( |
85 this, | 86 this, |
86 browser_context_->GetRequestContext(), | 87 content::BrowserContext::GetDefaultStoragePartition(browser_context_)-> |
| 88 GetURLRequestContext(), |
87 referrer_url_, | 89 referrer_url_, |
88 extension->id())); | 90 extension->id())); |
89 webstore_data_fetcher_->Start(); | 91 webstore_data_fetcher_->Start(); |
90 } else { | 92 } else { |
91 ExtensionInstallPrompt::PromptType type = | 93 ExtensionInstallPrompt::PromptType type = |
92 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension( | 94 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension( |
93 browser_context, extension.get()); | 95 browser_context, extension.get()); |
94 install_prompt_->ShowDialog( | 96 install_prompt_->ShowDialog( |
95 base::Bind(&ExtensionReenabler::OnInstallPromptDone, | 97 base::Bind(&ExtensionReenabler::OnInstallPromptDone, |
96 weak_factory_.GetWeakPtr()), | 98 weak_factory_.GetWeakPtr()), |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 } | 184 } |
183 | 185 |
184 void ExtensionReenabler::Finish(ReenableResult result) { | 186 void ExtensionReenabler::Finish(ReenableResult result) { |
185 DCHECK(!finished_); | 187 DCHECK(!finished_); |
186 finished_ = true; | 188 finished_ = true; |
187 registry_observer_.RemoveAll(); | 189 registry_observer_.RemoveAll(); |
188 callback_.Run(result); | 190 callback_.Run(result); |
189 } | 191 } |
190 | 192 |
191 } // namespace extensions | 193 } // namespace extensions |
OLD | NEW |