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

Side by Side Diff: chrome/browser/extensions/browser_action_test_util_views.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/views/browser_actions_container.h" 10 #include "chrome/browser/ui/views/browser_actions_container.h"
11 #include "chrome/browser/ui/views/extensions/extension_popup.h" 11 #include "chrome/browser/ui/views/extensions/extension_popup.h"
12 #include "chrome/browser/ui/views/toolbar_view.h" 12 #include "chrome/browser/ui/views/toolbar_view.h"
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 "ui/gfx/rect.h"
16 #include "gfx/size.h" 16 #include "ui/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()->
23 browser_actions(); 23 browser_actions();
24 return container; 24 return container;
25 } 25 }
26 26
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/browser_action_test_util_mac.mm ('k') | chrome/browser/extensions/convert_web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698