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

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_action_manager.h" 8 #include "chrome/browser/extensions/extension_action_manager.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/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" 12 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"
13 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 13 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
14 #include "chrome/browser/ui/views/extensions/extension_popup.h" 14 #include "chrome/browser/ui/views/extensions/extension_popup.h"
15 #include "chrome/browser/ui/views/frame/browser_window_testing_views.h" 15 #include "chrome/browser/ui/views/frame/browser_window_testing_views.h"
16 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 16 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
17 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" 17 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
18 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 18 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/gfx/geometry/rect.h" 20 #include "ui/gfx/geometry/rect.h"
21 #include "ui/gfx/geometry/size.h"
21 #include "ui/gfx/image/image.h" 22 #include "ui/gfx/image/image.h"
22 #include "ui/gfx/size.h"
23 #include "ui/views/widget/widget.h" 23 #include "ui/views/widget/widget.h"
24 24
25 namespace { 25 namespace {
26 26
27 BrowserActionsContainer* GetContainer(Browser* browser, 27 BrowserActionsContainer* GetContainer(Browser* browser,
28 ToolbarActionsBarDelegate* bar_delegate) { 28 ToolbarActionsBarDelegate* bar_delegate) {
29 if (bar_delegate) 29 if (bar_delegate)
30 return static_cast<BrowserActionsContainer*>(bar_delegate); 30 return static_cast<BrowserActionsContainer*>(bar_delegate);
31 return browser->window()->GetBrowserWindowTesting()->GetToolbarView()-> 31 return browser->window()->GetBrowserWindowTesting()->GetToolbarView()->
32 browser_actions(); 32 browser_actions();
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 // static 125 // static
126 gfx::Size BrowserActionTestUtil::GetMinPopupSize() { 126 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
127 return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight); 127 return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight);
128 } 128 }
129 129
130 // static 130 // static
131 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() { 131 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
132 return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight); 132 return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight);
133 } 133 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698