OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_install_dialog_controller.
h" | 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.
h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/ref_counted.h" |
9 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/browser/ui/browser_finder.h" | 12 #include "chrome/browser/ui/browser_finder.h" |
12 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh
eet.h" | 13 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh
eet.h" |
13 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_w
indow.h" | 14 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_w
indow.h" |
14 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" | 15 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" |
15 #import "chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
" | 16 #import "chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
" |
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
17 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
18 | 19 |
19 namespace { | 20 namespace { |
20 | 21 |
21 void ShowExtensionInstallDialogImpl( | 22 void ShowExtensionInstallDialogImpl( |
22 const ExtensionInstallPrompt::ShowParams& show_params, | 23 const ExtensionInstallPrompt::ShowParams& show_params, |
23 ExtensionInstallPrompt::Delegate* delegate, | 24 ExtensionInstallPrompt::Delegate* delegate, |
24 const ExtensionInstallPrompt::Prompt& prompt) { | 25 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) { |
25 // These objects will delete themselves when the dialog closes. | 26 // These objects will delete themselves when the dialog closes. |
26 if (!show_params.parent_web_contents) { | 27 if (!show_params.parent_web_contents) { |
27 new WindowedInstallDialogController(show_params, delegate, prompt); | 28 new WindowedInstallDialogController(show_params, delegate, prompt); |
28 return; | 29 return; |
29 } | 30 } |
30 | 31 |
31 new ExtensionInstallDialogController(show_params, delegate, prompt); | 32 new ExtensionInstallDialogController(show_params, delegate, prompt); |
32 } | 33 } |
33 | 34 |
34 } // namespace | 35 } // namespace |
35 | 36 |
36 ExtensionInstallDialogController::ExtensionInstallDialogController( | 37 ExtensionInstallDialogController::ExtensionInstallDialogController( |
37 const ExtensionInstallPrompt::ShowParams& show_params, | 38 const ExtensionInstallPrompt::ShowParams& show_params, |
38 ExtensionInstallPrompt::Delegate* delegate, | 39 ExtensionInstallPrompt::Delegate* delegate, |
39 const ExtensionInstallPrompt::Prompt& prompt) : delegate_(delegate) { | 40 scoped_refptr<ExtensionInstallPrompt::Prompt> prompt) |
| 41 : delegate_(delegate) { |
40 view_controller_.reset([[ExtensionInstallViewController alloc] | 42 view_controller_.reset([[ExtensionInstallViewController alloc] |
41 initWithNavigator:show_params.navigator | 43 initWithNavigator:show_params.navigator |
42 delegate:this | 44 delegate:this |
43 prompt:prompt]); | 45 prompt:prompt]); |
44 | 46 |
45 base::scoped_nsobject<NSWindow> window([[ConstrainedWindowCustomWindow alloc] | 47 base::scoped_nsobject<NSWindow> window([[ConstrainedWindowCustomWindow alloc] |
46 initWithContentRect:[[view_controller_ view] bounds]]); | 48 initWithContentRect:[[view_controller_ view] bounds]]); |
47 [[window contentView] addSubview:[view_controller_ view]]; | 49 [[window contentView] addSubview:[view_controller_ view]]; |
48 | 50 |
49 base::scoped_nsobject<CustomConstrainedWindowSheet> sheet( | 51 base::scoped_nsobject<CustomConstrainedWindowSheet> sheet( |
(...skipping 22 matching lines...) Expand all Loading... |
72 if (delegate_) | 74 if (delegate_) |
73 delegate_->InstallUIAbort(false); | 75 delegate_->InstallUIAbort(false); |
74 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 76 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); |
75 } | 77 } |
76 | 78 |
77 // static | 79 // static |
78 ExtensionInstallPrompt::ShowDialogCallback | 80 ExtensionInstallPrompt::ShowDialogCallback |
79 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { | 81 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { |
80 return base::Bind(&ShowExtensionInstallDialogImpl); | 82 return base::Bind(&ShowExtensionInstallDialogImpl); |
81 } | 83 } |
OLD | NEW |