| 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 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 5 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 
| 6 | 6 | 
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> | 
| 8 | 8 | 
| 9 #include <memory> | 9 #include <memory> | 
| 10 | 10 | 
| 11 #include "base/bind.h" | 11 #include "base/bind.h" | 
| 12 #include "base/callback.h" | 12 #include "base/callback.h" | 
| 13 #include "base/callback_helpers.h" | 13 #include "base/callback_helpers.h" | 
| 14 #include "base/macros.h" | 14 #include "base/macros.h" | 
| 15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" | 
| 16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" | 
| 17 #include "base/threading/thread_task_runner_handle.h" | 17 #include "base/threading/thread_task_runner_handle.h" | 
| 18 #include "chrome/browser/extensions/extension_action_test_util.h" | 18 #include "chrome/browser/extensions/extension_action_test_util.h" | 
| 19 #include "chrome/browser/extensions/extension_browsertest.h" | 19 #include "chrome/browser/extensions/extension_browsertest.h" | 
| 20 #include "chrome/browser/extensions/extension_service.h" | 20 #include "chrome/browser/extensions/extension_service.h" | 
| 21 #include "chrome/browser/ui/browser_window.h" | 21 #include "chrome/browser/ui/browser_window.h" | 
| 22 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" | 22 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" | 
| 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 
| 24 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 24 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | 
| 25 #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" | 26 #import "chrome/browser/ui/cocoa/test/run_loop_testing.h" | 
| 27 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 27 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 
| 28 #include "chrome/browser/ui/global_error/global_error.h" | 28 #include "chrome/browser/ui/global_error/global_error.h" | 
| 29 #include "chrome/browser/ui/global_error/global_error_service.h" | 29 #include "chrome/browser/ui/global_error/global_error_service.h" | 
| 30 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 30 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 
| 31 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 31 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 
| 32 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | 32 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | 
| 33 #include "chrome/test/base/interactive_test_utils.h" | 33 #include "chrome/test/base/interactive_test_utils.h" | 
| 34 #include "extensions/common/feature_switch.h" | 34 #include "extensions/common/feature_switch.h" | 
| 35 #include "ui/base/cocoa/cocoa_base_utils.h" | 35 #include "ui/base/cocoa/cocoa_base_utils.h" | 
| 36 #import "ui/events/test/cocoa_test_event_utils.h" | 36 #import "ui/events/test/cocoa_test_event_utils.h" | 
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 642   openAndCloseAppMenu(appMenuController()); | 642   openAndCloseAppMenu(appMenuController()); | 
| 643 | 643 | 
| 644   // Move the extension back to the main bar, so an overflow bar is no longer | 644   // Move the extension back to the main bar, so an overflow bar is no longer | 
| 645   // needed. Then open and close the app menu a couple times. | 645   // needed. Then open and close the app menu a couple times. | 
| 646   // This tests that the menu properly cleans up after itself when an overflow | 646   // This tests that the menu properly cleans up after itself when an overflow | 
| 647   // was present, and is no longer (fix for crbug.com/603241). | 647   // was present, and is no longer (fix for crbug.com/603241). | 
| 648   model()->SetVisibleIconCount(1); | 648   model()->SetVisibleIconCount(1); | 
| 649   openAndCloseAppMenu(appMenuController()); | 649   openAndCloseAppMenu(appMenuController()); | 
| 650   openAndCloseAppMenu(appMenuController()); | 650   openAndCloseAppMenu(appMenuController()); | 
| 651 } | 651 } | 
| OLD | NEW | 
|---|