| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/extensions/browser_action_test_util.h" | 5 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 6 | 6 |
| 7 #include "base/mac/foundation_util.h" | 7 #include "base/mac/foundation_util.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #include "chrome/browser/extensions/extension_toolbar_model.h" | 9 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" | |
| 12 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | |
| 13 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 11 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 12 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 15 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 13 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
| 14 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
| 16 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 15 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" |
| 17 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" | |
| 18 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 16 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
| 19 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 17 #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
| 20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 21 #include "ui/gfx/rect.h" | 19 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" |
| 20 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
| 21 #include "ui/gfx/geometry/rect.h" |
| 22 #include "ui/gfx/size.h" | 22 #include "ui/gfx/size.h" |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 BrowserActionsController* GetController( | 26 BrowserActionsController* GetController( |
| 27 Browser* browser, | 27 Browser* browser, |
| 28 ToolbarActionsBarDelegate* barDelegate) { | 28 ToolbarActionsBarDelegate* barDelegate) { |
| 29 if (barDelegate) | 29 if (barDelegate) |
| 30 return [BrowserActionsController fromToolbarActionsBarDelegate:barDelegate]; | 30 return [BrowserActionsController fromToolbarActionsBarDelegate:barDelegate]; |
| 31 | 31 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 | 129 |
| 130 // static | 130 // static |
| 131 gfx::Size BrowserActionTestUtil::GetMinPopupSize() { | 131 gfx::Size BrowserActionTestUtil::GetMinPopupSize() { |
| 132 return gfx::Size(NSSizeToCGSize([ExtensionPopupController minPopupSize])); | 132 return gfx::Size(NSSizeToCGSize([ExtensionPopupController minPopupSize])); |
| 133 } | 133 } |
| 134 | 134 |
| 135 // static | 135 // static |
| 136 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() { | 136 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() { |
| 137 return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize])); | 137 return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize])); |
| 138 } | 138 } |
| OLD | NEW |