Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_cocoa.mm

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #import "chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_c ocoa.h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_action_platform_delegate_c ocoa.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h"
11 #include "chrome/browser/extensions/extension_action.h" 12 #include "chrome/browser/extensions/extension_action.h"
12 #include "chrome/browser/extensions/extension_view_host.h" 13 #include "chrome/browser/extensions/extension_view_host.h"
13 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
15 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" 16 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
16 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 17 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
17 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 18 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
18 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 19 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
19 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 20 #import "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"
(...skipping 15 matching lines...) Expand all
36 return extensions::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC; 37 return extensions::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC;
37 38
38 // We should only have page and browser action types. 39 // We should only have page and browser action types.
39 DCHECK_EQ(extensions::ActionInfo::TYPE_PAGE, extension_action.action_type()); 40 DCHECK_EQ(extensions::ActionInfo::TYPE_PAGE, extension_action.action_type());
40 return extensions::NOTIFICATION_EXTENSION_COMMAND_PAGE_ACTION_MAC; 41 return extensions::NOTIFICATION_EXTENSION_COMMAND_PAGE_ACTION_MAC;
41 } 42 }
42 43
43 } // namespace 44 } // namespace
44 45
45 // static 46 // static
46 scoped_ptr<ExtensionActionPlatformDelegate> 47 std::unique_ptr<ExtensionActionPlatformDelegate>
47 ExtensionActionPlatformDelegate::Create( 48 ExtensionActionPlatformDelegate::Create(
48 ExtensionActionViewController* controller) { 49 ExtensionActionViewController* controller) {
49 return make_scoped_ptr(new ExtensionActionPlatformDelegateCocoa(controller)); 50 return base::WrapUnique(new ExtensionActionPlatformDelegateCocoa(controller));
50 } 51 }
51 52
52 ExtensionActionPlatformDelegateCocoa::ExtensionActionPlatformDelegateCocoa( 53 ExtensionActionPlatformDelegateCocoa::ExtensionActionPlatformDelegateCocoa(
53 ExtensionActionViewController* controller) 54 ExtensionActionViewController* controller)
54 : controller_(controller) { 55 : controller_(controller) {
55 } 56 }
56 57
57 ExtensionActionPlatformDelegateCocoa::~ExtensionActionPlatformDelegateCocoa() { 58 ExtensionActionPlatformDelegateCocoa::~ExtensionActionPlatformDelegateCocoa() {
58 } 59 }
59 60
60 void ExtensionActionPlatformDelegateCocoa::RegisterCommand() { 61 void ExtensionActionPlatformDelegateCocoa::RegisterCommand() {
61 // Commands are handled elsewhere for Cocoa. 62 // Commands are handled elsewhere for Cocoa.
62 } 63 }
63 64
64 void ExtensionActionPlatformDelegateCocoa::OnDelegateSet() { 65 void ExtensionActionPlatformDelegateCocoa::OnDelegateSet() {
65 registrar_.Add( 66 registrar_.Add(
66 this, 67 this,
67 GetNotificationTypeForAction(*controller_->extension_action()), 68 GetNotificationTypeForAction(*controller_->extension_action()),
68 content::Source<Profile>(controller_->browser()->profile())); 69 content::Source<Profile>(controller_->browser()->profile()));
69 } 70 }
70 71
71 void ExtensionActionPlatformDelegateCocoa::ShowPopup( 72 void ExtensionActionPlatformDelegateCocoa::ShowPopup(
72 scoped_ptr<extensions::ExtensionViewHost> host, 73 std::unique_ptr<extensions::ExtensionViewHost> host,
73 bool grant_tab_permissions, 74 bool grant_tab_permissions,
74 ExtensionActionViewController::PopupShowAction show_action) { 75 ExtensionActionViewController::PopupShowAction show_action) {
75 BOOL devMode = 76 BOOL devMode =
76 show_action == ExtensionActionViewController::SHOW_POPUP_AND_INSPECT; 77 show_action == ExtensionActionViewController::SHOW_POPUP_AND_INSPECT;
77 [ExtensionPopupController host:std::move(host) 78 [ExtensionPopupController host:std::move(host)
78 inBrowser:controller_->browser() 79 inBrowser:controller_->browser()
79 anchoredAt:GetPopupPoint() 80 anchoredAt:GetPopupPoint()
80 arrowLocation:info_bubble::kTopRight 81 arrowLocation:info_bubble::kTopRight
81 devMode:devMode]; 82 devMode:devMode];
82 } 83 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 controller_->IsEnabled( 147 controller_->IsEnabled(
147 controller_->view_delegate()->GetCurrentWebContents())) { 148 controller_->view_delegate()->GetCurrentWebContents())) {
148 controller_->ExecuteAction(true); 149 controller_->ExecuteAction(true);
149 } 150 }
150 break; 151 break;
151 } 152 }
152 default: 153 default:
153 NOTREACHED() << L"Unexpected notification"; 154 NOTREACHED() << L"Unexpected notification";
154 } 155 }
155 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698