diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 02:38:02 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 02:38:02 +0000 |
commit | ba9c96c6105f11088857ad234221b949f86e05b9 (patch) | |
tree | dfc3307c6470bfb5fae423b0d66e16edeebc5e79 /chrome/browser/cocoa/extensions | |
parent | d00c162781047db67af6ea481b85bcd3c69d24a3 (diff) | |
download | chromium_src-ba9c96c6105f11088857ad234221b949f86e05b9.zip chromium_src-ba9c96c6105f11088857ad234221b949f86e05b9.tar.gz chromium_src-ba9c96c6105f11088857ad234221b949f86e05b9.tar.bz2 |
Remove create_app_shortcut param from ExtensionInstallUI::Delegate::InstallUIProceed.
Reason: We don't support shortcut creation from this dialog anymore.
(Note: this was a TODO for Aaron).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3305030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/extensions')
3 files changed, 4 insertions, 14 deletions
diff --git a/chrome/browser/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/cocoa/extensions/extension_action_context_menu.mm index 5e20237..10ea079 100644 --- a/chrome/browser/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/cocoa/extensions/extension_action_context_menu.mm @@ -45,8 +45,7 @@ class AsyncUninstaller : public ExtensionInstallUI::Delegate { ~AsyncUninstaller() {} // Overridden by ExtensionInstallUI::Delegate. - virtual void InstallUIProceed(bool create_shortcut) { - DCHECK(!create_shortcut); + virtual void InstallUIProceed() { profile_->GetExtensionsService()-> UninstallExtension(extension_->id(), false); } diff --git a/chrome/browser/cocoa/extensions/extension_install_prompt_controller.mm b/chrome/browser/cocoa/extensions/extension_install_prompt_controller.mm index 5c738a1..9ba758b 100644 --- a/chrome/browser/cocoa/extensions/extension_install_prompt_controller.mm +++ b/chrome/browser/cocoa/extensions/extension_install_prompt_controller.mm @@ -117,7 +117,7 @@ void OffsetControlVertically(NSControl* control, CGFloat amount) { } - (IBAction)ok:(id)sender { - delegate_->InstallUIProceed(false); // Don't create shortcut. + delegate_->InstallUIProceed(); [NSApp endSheet:[self window]]; } diff --git a/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm b/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm index 3ad12db..f596851 100644 --- a/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm +++ b/chrome/browser/cocoa/extensions/extension_install_prompt_controller_unittest.mm @@ -82,13 +82,11 @@ class MockExtensionInstallUIDelegate : public ExtensionInstallUI::Delegate { public: MockExtensionInstallUIDelegate() : proceed_count_(0), - abort_count_(0), - last_proceed_was_create_app_shortcut_(0) {} + abort_count_(0) {} // ExtensionInstallUI::Delegate overrides. - virtual void InstallUIProceed(bool create_app_shortcut) { + virtual void InstallUIProceed() { proceed_count_++; - last_proceed_was_create_app_shortcut_ = create_app_shortcut; } virtual void InstallUIAbort() { @@ -97,17 +95,12 @@ class MockExtensionInstallUIDelegate : public ExtensionInstallUI::Delegate { int proceed_count() { return proceed_count_; } int abort_count() { return abort_count_; } - bool last_proceed_was_create_app_shortcut() { - return last_proceed_was_create_app_shortcut_; - } protected: int proceed_count_; int abort_count_; - bool last_proceed_was_create_app_shortcut_; }; - // Test that we can load the two kinds of prompts correctly, that the outlets // are hooked up, and that the dialog calls cancel when cancel is pressed. TEST_F(ExtensionInstallPromptControllerTest, BasicsNormalCancel) { @@ -163,7 +156,6 @@ TEST_F(ExtensionInstallPromptControllerTest, BasicsNormalCancel) { [controller cancel:nil]; EXPECT_EQ(1, delegate->abort_count()); EXPECT_EQ(0, delegate->proceed_count()); - EXPECT_FALSE(delegate->last_proceed_was_create_app_shortcut()); } @@ -188,7 +180,6 @@ TEST_F(ExtensionInstallPromptControllerTest, BasicsNormalOK) { EXPECT_EQ(0, delegate->abort_count()); EXPECT_EQ(1, delegate->proceed_count()); - EXPECT_FALSE(delegate->last_proceed_was_create_app_shortcut()); } // Test that controls get repositioned when there are two warnings vs one |