OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/ui/views/extensions/extension_action_platform_delegate_
views.h" | 5 #include "chrome/browser/ui/views/extensions/extension_action_platform_delegate_
views.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "chrome/browser/extensions/extension_action.h" | 11 #include "chrome/browser/extensions/extension_action.h" |
11 #include "chrome/browser/extensions/extension_view_host.h" | 12 #include "chrome/browser/extensions/extension_view_host.h" |
12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/extensions/accelerator_priority.h" | 15 #include "chrome/browser/ui/extensions/accelerator_priority.h" |
15 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
16 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" | 17 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
17 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 18 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
18 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" | 19 #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" |
19 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
20 #include "chrome/common/extensions/api/extension_action/action_info.h" | 21 #include "chrome/common/extensions/api/extension_action/action_info.h" |
21 #include "chrome/common/extensions/command.h" | 22 #include "chrome/common/extensions/command.h" |
22 #include "content/public/browser/notification_details.h" | 23 #include "content/public/browser/notification_details.h" |
23 #include "content/public/browser/notification_source.h" | 24 #include "content/public/browser/notification_source.h" |
24 #include "extensions/browser/notification_types.h" | 25 #include "extensions/browser/notification_types.h" |
25 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
26 #include "extensions/common/manifest_constants.h" | 27 #include "extensions/common/manifest_constants.h" |
27 #include "ui/views/view.h" | 28 #include "ui/views/view.h" |
28 | 29 |
29 using extensions::ActionInfo; | 30 using extensions::ActionInfo; |
30 | 31 |
31 // static | 32 // static |
32 scoped_ptr<ExtensionActionPlatformDelegate> | 33 std::unique_ptr<ExtensionActionPlatformDelegate> |
33 ExtensionActionPlatformDelegate::Create( | 34 ExtensionActionPlatformDelegate::Create( |
34 ExtensionActionViewController* controller) { | 35 ExtensionActionViewController* controller) { |
35 return make_scoped_ptr(new ExtensionActionPlatformDelegateViews(controller)); | 36 return base::WrapUnique(new ExtensionActionPlatformDelegateViews(controller)); |
36 } | 37 } |
37 | 38 |
38 ExtensionActionPlatformDelegateViews::ExtensionActionPlatformDelegateViews( | 39 ExtensionActionPlatformDelegateViews::ExtensionActionPlatformDelegateViews( |
39 ExtensionActionViewController* controller) | 40 ExtensionActionViewController* controller) |
40 : controller_(controller) { | 41 : controller_(controller) { |
41 content::NotificationSource notification_source = content::Source<Profile>( | 42 content::NotificationSource notification_source = content::Source<Profile>( |
42 controller_->browser()->profile()->GetOriginalProfile()); | 43 controller_->browser()->profile()->GetOriginalProfile()); |
43 registrar_.Add(this, | 44 registrar_.Add(this, |
44 extensions::NOTIFICATION_EXTENSION_COMMAND_ADDED, | 45 extensions::NOTIFICATION_EXTENSION_COMMAND_ADDED, |
45 notification_source); | 46 notification_source); |
(...skipping 19 matching lines...) Expand all Loading... |
65 new ui::Accelerator(extension_command.accelerator())); | 66 new ui::Accelerator(extension_command.accelerator())); |
66 focus_manager->RegisterAccelerator( | 67 focus_manager->RegisterAccelerator( |
67 *action_keybinding_, | 68 *action_keybinding_, |
68 GetAcceleratorPriority(extension_command.accelerator(), | 69 GetAcceleratorPriority(extension_command.accelerator(), |
69 controller_->extension()), | 70 controller_->extension()), |
70 this); | 71 this); |
71 } | 72 } |
72 } | 73 } |
73 | 74 |
74 void ExtensionActionPlatformDelegateViews::ShowPopup( | 75 void ExtensionActionPlatformDelegateViews::ShowPopup( |
75 scoped_ptr<extensions::ExtensionViewHost> host, | 76 std::unique_ptr<extensions::ExtensionViewHost> host, |
76 bool grant_tab_permissions, | 77 bool grant_tab_permissions, |
77 ExtensionActionViewController::PopupShowAction show_action) { | 78 ExtensionActionViewController::PopupShowAction show_action) { |
78 // TOP_RIGHT is correct for both RTL and LTR, because the views platform | 79 // TOP_RIGHT is correct for both RTL and LTR, because the views platform |
79 // performs the flipping in RTL cases. | 80 // performs the flipping in RTL cases. |
80 views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT; | 81 views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT; |
81 | 82 |
82 views::View* reference_view = GetDelegateViews()->GetReferenceViewForPopup(); | 83 views::View* reference_view = GetDelegateViews()->GetReferenceViewForPopup(); |
83 | 84 |
84 ExtensionPopup::ShowAction popup_show_action = | 85 ExtensionPopup::ShowAction popup_show_action = |
85 show_action == ExtensionActionViewController::SHOW_POPUP ? | 86 show_action == ExtensionActionViewController::SHOW_POPUP ? |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 focus_manager->UnregisterAccelerator(*action_keybinding_, this); | 169 focus_manager->UnregisterAccelerator(*action_keybinding_, this); |
169 action_keybinding_.reset(); | 170 action_keybinding_.reset(); |
170 } | 171 } |
171 } | 172 } |
172 | 173 |
173 ToolbarActionViewDelegateViews* | 174 ToolbarActionViewDelegateViews* |
174 ExtensionActionPlatformDelegateViews::GetDelegateViews() const { | 175 ExtensionActionPlatformDelegateViews::GetDelegateViews() const { |
175 return static_cast<ToolbarActionViewDelegateViews*>( | 176 return static_cast<ToolbarActionViewDelegateViews*>( |
176 controller_->view_delegate()); | 177 controller_->view_delegate()); |
177 } | 178 } |
OLD | NEW |