summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_service.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-22 21:01:35 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-22 21:01:35 +0000
commitcc829cf6a86824c7651abf68b47993b3d1629260 (patch)
treed3aada7adc47acfa17c716194833f8eb5eef81eb /chrome/browser/extensions/extension_service.cc
parent85d52babf996c106a02b8fea6d07870351f82908 (diff)
downloadchromium_src-cc829cf6a86824c7651abf68b47993b3d1629260.zip
chromium_src-cc829cf6a86824c7651abf68b47993b3d1629260.tar.gz
chromium_src-cc829cf6a86824c7651abf68b47993b3d1629260.tar.bz2
ntp4: make app-install-via-drag less janky
don't reposition the tiles since we always add the app at the end anyways. Also, respect which page it's dropped on (instead of always adding to the first page). BUG=93159 TEST=drag a most visited tile onto an apps page. Review URL: http://codereview.chromium.org/7677032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.cc')
-rw-r--r--chrome/browser/extensions/extension_service.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index c2f6431..e271cab 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.
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.