| OLD | NEW | 
|---|
| 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 #include "base/macros.h" | 5 #include "base/macros.h" | 
| 6 #include "chrome/browser/ui/browser_window.h" | 6 #include "chrome/browser/ui/browser_window.h" | 
| 7 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 7 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 
| 8 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 8 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 
| 9 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 9 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 
| 10 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h" | 10 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h" | 
| 11 #import "chrome/browser/ui/cocoa/run_loop_testing.h" | 11 #import "chrome/browser/ui/cocoa/test/run_loop_testing.h" | 
| 12 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 12 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 
| 13 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" | 13 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" | 
| 14 #include "ui/base/cocoa/cocoa_base_utils.h" | 14 #include "ui/base/cocoa/cocoa_base_utils.h" | 
| 15 #include "ui/events/test/cocoa_test_event_utils.h" | 15 #include "ui/events/test/cocoa_test_event_utils.h" | 
| 16 | 16 | 
| 17 namespace { | 17 namespace { | 
| 18 | 18 | 
| 19 // Returns the ToolbarController for the given browser. | 19 // Returns the ToolbarController for the given browser. | 
| 20 ToolbarController* ToolbarControllerForBrowser(Browser* browser) { | 20 ToolbarController* ToolbarControllerForBrowser(Browser* browser) { | 
| 21   return [[BrowserWindowController browserWindowControllerForWindow: | 21   return [[BrowserWindowController browserWindowControllerForWindow: | 
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 252 | 252 | 
| 253 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac, | 253 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac, | 
| 254                        PRE_TestControlledStartupNotShownOnRestart) { | 254                        PRE_TestControlledStartupNotShownOnRestart) { | 
| 255   PreTestControlledStartupNotShownOnRestart(); | 255   PreTestControlledStartupNotShownOnRestart(); | 
| 256 } | 256 } | 
| 257 | 257 | 
| 258 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac, | 258 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleBrowserTestMac, | 
| 259                        TestControlledStartupNotShownOnRestart) { | 259                        TestControlledStartupNotShownOnRestart) { | 
| 260   TestControlledStartupNotShownOnRestart(); | 260   TestControlledStartupNotShownOnRestart(); | 
| 261 } | 261 } | 
| OLD | NEW | 
|---|