summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 07:18:45 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-19 07:18:45 +0000
commit21217cab5b687af94175570fc301b6e33dc4e085 (patch)
tree6d9f74816baeb04301b44d88ad17afa2dabb74eb /chrome/browser/cocoa
parentf1c42aa16ff81a4983d17b717513e231e1850ab2 (diff)
downloadchromium_src-21217cab5b687af94175570fc301b6e33dc4e085.zip
chromium_src-21217cab5b687af94175570fc301b6e33dc4e085.tar.gz
chromium_src-21217cab5b687af94175570fc301b6e33dc4e085.tar.bz2
Only create a desktop shortcut for apps if the user requests.
BUG=32361 Review URL: http://codereview.chromium.org/551052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/extension_install_prompt.mm2
-rw-r--r--chrome/browser/cocoa/extensions/extension_action_context_menu.mm3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/extension_install_prompt.mm b/chrome/browser/cocoa/extension_install_prompt.mm
index 059bd7d..d53fc19 100644
--- a/chrome/browser/cocoa/extension_install_prompt.mm
+++ b/chrome/browser/cocoa/extension_install_prompt.mm
@@ -43,7 +43,7 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl(
[alert setIcon:gfx::SkBitmapToNSImage(*icon)];
if ([alert runModal] == NSAlertFirstButtonReturn) {
- delegate->InstallUIProceed();
+ delegate->InstallUIProceed(false);
} else {
delegate->InstallUIAbort();
}
diff --git a/chrome/browser/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/cocoa/extensions/extension_action_context_menu.mm
index ee3c6ae..ff7cd40 100644
--- a/chrome/browser/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/cocoa/extensions/extension_action_context_menu.mm
@@ -37,7 +37,8 @@ class AsyncUninstaller : public base::RefCountedThreadSafe<AsyncUninstaller>,
}
// Overridden by ExtensionInstallUI::Delegate.
- virtual void InstallUIProceed() {
+ virtual void InstallUIProceed(bool create_shortcut) {
+ DCHECK(!create_shortcut);
Browser* browser = BrowserList::GetLastActive();
// GetLastActive() returns NULL during testing.
if (!browser)