Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/browser.h" | |
| 9 #include "chrome/browser/browser_window.h" | 8 #include "chrome/browser/browser_window.h" |
| 10 #include "chrome/browser/views/browser_actions_container.h" | 9 #include "chrome/browser/views/browser_actions_container.h" |
| 11 #include "chrome/browser/views/extensions/extension_popup.h" | 10 #include "chrome/browser/views/extensions/extension_popup.h" |
| 12 #include "chrome/browser/views/toolbar_view.h" | 11 #include "chrome/browser/views/toolbar_view.h" |
| 12 #include "chrome/browser/ui/browser.h" | |
|
Lei Zhang
2010/11/16 20:01:28
u before v.
James Hawkins
2010/11/16 20:43:29
Done.
| |
| 13 #include "chrome/test/in_process_browser_test.h" | 13 #include "chrome/test/in_process_browser_test.h" |
| 14 #include "chrome/test/ui_test_utils.h" | 14 #include "chrome/test/ui_test_utils.h" |
| 15 #include "gfx/rect.h" | 15 #include "gfx/rect.h" |
| 16 #include "gfx/size.h" | 16 #include "gfx/size.h" |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 BrowserActionsContainer* GetContainer(Browser* browser) { | 20 BrowserActionsContainer* GetContainer(Browser* browser) { |
| 21 BrowserActionsContainer* container = | 21 BrowserActionsContainer* container = |
| 22 browser->window()->GetBrowserWindowTesting()->GetToolbarView()-> | 22 browser->window()->GetBrowserWindowTesting()->GetToolbarView()-> |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 GetContainer(browser_)->TestSetIconVisibilityCount(icons); | 80 GetContainer(browser_)->TestSetIconVisibilityCount(icons); |
| 81 } | 81 } |
| 82 | 82 |
| 83 gfx::Size BrowserActionTestUtil::GetMinPopupSize() { | 83 gfx::Size BrowserActionTestUtil::GetMinPopupSize() { |
| 84 return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight); | 84 return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight); |
| 85 } | 85 } |
| 86 | 86 |
| 87 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() { | 87 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() { |
| 88 return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight); | 88 return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight); |
| 89 } | 89 } |
| OLD | NEW |