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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 7677032: ntp4: make app-install-via-drag less janky (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more test fixes Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/test_extension_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index c2f64316ba7f11e6c16f6035067e36f1cc6b359a..e271cabc9c36fa9d65109281520c6c6389e8a0b4 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -190,7 +190,7 @@ void SimpleExtensionLoadPrompt::ShowPrompt() {
void SimpleExtensionLoadPrompt::InstallUIProceed() {
if (extension_service_.get())
extension_service_->OnExtensionInstalled(
- extension_, false); // Not from web store.
+ extension_, false, 0); // Not from web store.
Aaron Boodman 2011/09/09 21:00:16 Since there are now two magic params that need exp
delete this;
}
@@ -2161,11 +2161,11 @@ void ExtensionService::OnLoadSingleExtension(const Extension* extension,
prompt->ShowPrompt();
return; // continues in SimpleExtensionLoadPrompt::InstallUI*
}
- OnExtensionInstalled(extension, false); // Not from web store.
+ OnExtensionInstalled(extension, false, 0); // Not from web store.
}
void ExtensionService::OnExtensionInstalled(
- const Extension* extension, bool from_webstore) {
+ const Extension* extension, bool from_webstore, int page_index) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Ensure extension is deleted unless we transfer ownership.
@@ -2222,7 +2222,8 @@ void ExtensionService::OnExtensionInstalled(
extension_prefs_->OnExtensionInstalled(
extension,
initial_enable ? Extension::ENABLED : Extension::DISABLED,
- from_webstore);
+ from_webstore,
+ page_index);
// Unpacked extensions default to allowing file access, but if that has been
// overridden, don't reset the value.
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/test_extension_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698