chrome/browser/ui/views/browser_action_test_util_views.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc ('k') | chrome/browser/ui/views/browser_action_view.cc » ('j') | no next file with comments »

OLD	NEW
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/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/ui/browser.h"	9 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/browser_window.h"	10 #include "chrome/browser/ui/browser_window.h"

11 #include "chrome/browser/ui/views/browser_action_view.h"	11 #include "chrome/browser/ui/views/browser_action_view.h"

12 #include "chrome/browser/ui/views/browser_actions_container.h"	12 #include "chrome/browser/ui/views/browser_actions_container.h"

13 #include "chrome/browser/ui/views/extensions/extension_popup.h"	13 #include "chrome/browser/ui/views/extensions/extension_popup.h"

14 #include "chrome/browser/ui/views/toolbar_view.h"	14 #include "chrome/browser/ui/views/toolbar_view.h"

15 #include "ui/gfx/image/image.h"	15 #include "ui/gfx/image/image.h"

16 #include "ui/gfx/rect.h"	16 #include "ui/gfx/rect.h"

17 #include "ui/gfx/size.h"	17 #include "ui/gfx/size.h"

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 GetContainer(browser_)->TestSetIconVisibilityCount(icons);	87 GetContainer(browser_)->TestSetIconVisibilityCount(icons);

88 }	88 }

89	89

90 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {	90 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {

91 return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight);	91 return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight);

92 }	92 }

93	93

94 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {	94 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {

95 return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight);	95 return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight);

96 }	96 }

OLD	NEW