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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/browser_action_button.h"
6
5 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
6 8
9 #include <memory>
10
7 #include "base/bind.h" 11 #include "base/bind.h"
8 #include "base/callback.h" 12 #include "base/callback.h"
9 #include "base/callback_helpers.h" 13 #include "base/callback_helpers.h"
10 #include "base/macros.h" 14 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
13 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
14 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/extensions/extension_action_test_util.h" 18 #include "chrome/browser/extensions/extension_action_test_util.h"
16 #include "chrome/browser/extensions/extension_browsertest.h" 19 #include "chrome/browser/extensions/extension_browsertest.h"
17 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/ui/browser_window.h" 21 #include "chrome/browser/ui/browser_window.h"
19 #import "chrome/browser/ui/cocoa/run_loop_testing.h"
20 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" 22 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
22 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
23 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 24 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
24 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 25 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
26 #import "chrome/browser/ui/cocoa/run_loop_testing.h"
25 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 27 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
26 #include "chrome/browser/ui/global_error/global_error.h" 28 #include "chrome/browser/ui/global_error/global_error.h"
27 #include "chrome/browser/ui/global_error/global_error_service.h" 29 #include "chrome/browser/ui/global_error/global_error_service.h"
28 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 30 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
29 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 31 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
30 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" 32 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
31 #include "chrome/test/base/interactive_test_utils.h" 33 #include "chrome/test/base/interactive_test_utils.h"
32 #include "extensions/common/feature_switch.h" 34 #include "extensions/common/feature_switch.h"
33 #include "ui/base/cocoa/cocoa_base_utils.h" 35 #include "ui/base/cocoa/cocoa_base_utils.h"
34 #import "ui/events/test/cocoa_test_event_utils.h" 36 #import "ui/events/test/cocoa_test_event_utils.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 ToolbarActionsBar::disable_animations_for_testing_ = false; 222 ToolbarActionsBar::disable_animations_for_testing_ = false;
221 ExtensionBrowserTest::TearDownOnMainThread(); 223 ExtensionBrowserTest::TearDownOnMainThread();
222 } 224 }
223 225
224 ToolbarController* toolbarController() { return toolbarController_; } 226 ToolbarController* toolbarController() { return toolbarController_; }
225 AppMenuController* appMenuController() { return appMenuController_; } 227 AppMenuController* appMenuController() { return appMenuController_; }
226 ToolbarActionsModel* model() { return model_; } 228 ToolbarActionsModel* model() { return model_; }
227 NSView* appMenuButton() { return [toolbarController_ appMenuButton]; } 229 NSView* appMenuButton() { return [toolbarController_ appMenuButton]; }
228 230
229 private: 231 private:
230 scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_; 232 std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
231 233
232 ToolbarController* toolbarController_ = nil; 234 ToolbarController* toolbarController_ = nil;
233 AppMenuController* appMenuController_ = nil; 235 AppMenuController* appMenuController_ = nil;
234 ToolbarActionsModel* model_ = nullptr; 236 ToolbarActionsModel* model_ = nullptr;
235 237
236 DISALLOW_COPY_AND_ASSIGN(BrowserActionButtonUiTest); 238 DISALLOW_COPY_AND_ASSIGN(BrowserActionButtonUiTest);
237 }; 239 };
238 240
239 // Simulates a clicks on the action button in the overflow menu, and runs 241 // Simulates a clicks on the action button in the overflow menu, and runs
240 // |closure| upon completion. 242 // |closure| upon completion.
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 { 583 {
582 EXPECT_FALSE([menuHelper menuOpened]); 584 EXPECT_FALSE([menuHelper menuOpened]);
583 base::RunLoop runLoop; 585 base::RunLoop runLoop;
584 ui_controls::SendKeyPressNotifyWhenDone([actionButton window], 586 ui_controls::SendKeyPressNotifyWhenDone([actionButton window],
585 ui::VKEY_SPACE, false, false, false, 587 ui::VKEY_SPACE, false, false, false,
586 false, runLoop.QuitClosure()); 588 false, runLoop.QuitClosure());
587 runLoop.Run(); 589 runLoop.Run();
588 EXPECT_TRUE([menuHelper menuOpened]); 590 EXPECT_TRUE([menuHelper menuOpened]);
589 } 591 }
590 } 592 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698