OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro ller.h" | 5 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro ller.h" |
6 | 6 |
7 #include "base/strings/sys_string_conversions.h" | 7 #include "base/strings/sys_string_conversions.h" |
8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
9 #include "chrome/browser/extensions/extension_action_manager.h" | 9 #include "chrome/browser/extensions/extension_action_manager.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
11 #include "chrome/browser/extensions/extension_tab_util.h" | 11 #include "chrome/browser/extensions/extension_tab_util.h" |
12 #include "chrome/browser/extensions/extension_uninstall_dialog.h" | 12 #include "chrome/browser/extensions/extension_uninstall_dialog.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_finder.h" | |
15 #include "chrome/browser/ui/chrome_pages.h" | 16 #include "chrome/browser/ui/chrome_pages.h" |
16 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 17 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
17 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 18 #include "chrome/browser/ui/cocoa/browser_window_controller.h" |
18 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 19 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" |
19 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 20 #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
20 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 21 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
21 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 22 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
22 #include "chrome/common/extensions/extension_constants.h" | 23 #include "chrome/common/extensions/extension_constants.h" |
23 #include "chrome/common/extensions/manifest_url_handler.h" | 24 #include "chrome/common/extensions/manifest_url_handler.h" |
24 #include "chrome/common/pref_names.h" | 25 #include "chrome/common/pref_names.h" |
(...skipping 13 matching lines...) Expand all Loading... | |
38 using extensions::Extension; | 39 using extensions::Extension; |
39 | 40 |
40 // A class that shows a confirmation dialog to uninstall the given extension. | 41 // A class that shows a confirmation dialog to uninstall the given extension. |
41 // Also acts as the extension's UI delegate in order to display the dialog. | 42 // Also acts as the extension's UI delegate in order to display the dialog. |
42 class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate { | 43 class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate { |
43 public: | 44 public: |
44 AsyncUninstaller(const Extension* extension, Browser* browser) | 45 AsyncUninstaller(const Extension* extension, Browser* browser) |
45 : extension_(extension), | 46 : extension_(extension), |
46 profile_(browser->profile()) { | 47 profile_(browser->profile()) { |
47 extension_uninstall_dialog_.reset( | 48 extension_uninstall_dialog_.reset( |
48 extensions::ExtensionUninstallDialog::Create(profile_, browser, this)); | 49 extensions::ExtensionUninstallDialog::Create( |
50 profile_, chrome::FindWindowForBrowser(browser), this)); | |
sashab
2014/07/23 23:57:26
tapted: Seeing as how Mac doesn't even need the pa
tapted
2014/07/24 00:35:36
I'm inclined to keep it, just because it's jumping
| |
49 extension_uninstall_dialog_->ConfirmUninstall(extension_); | 51 extension_uninstall_dialog_->ConfirmUninstall(extension_); |
50 } | 52 } |
51 | 53 |
52 virtual ~AsyncUninstaller() {} | 54 virtual ~AsyncUninstaller() {} |
53 | 55 |
54 // ExtensionUninstallDialog::Delegate: | 56 // ExtensionUninstallDialog::Delegate: |
55 virtual void ExtensionUninstallAccepted() OVERRIDE { | 57 virtual void ExtensionUninstallAccepted() OVERRIDE { |
56 extensions::ExtensionSystem::Get(profile_) | 58 extensions::ExtensionSystem::Get(profile_) |
57 ->extension_service() | 59 ->extension_service() |
58 ->UninstallExtension(extension_->id(), | 60 ->UninstallExtension(extension_->id(), |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
222 return; | 224 return; |
223 | 225 |
224 [ExtensionPopupController showURL:url | 226 [ExtensionPopupController showURL:url |
225 inBrowser:browser_ | 227 inBrowser:browser_ |
226 anchoredAt:popupPoint | 228 anchoredAt:popupPoint |
227 arrowLocation:info_bubble::kTopRight | 229 arrowLocation:info_bubble::kTopRight |
228 devMode:YES]; | 230 devMode:YES]; |
229 } | 231 } |
230 | 232 |
231 @end | 233 @end |
OLD | NEW |