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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

Issue 1133713009: Subject .mm files to the header sorting presubmit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase - of course... it would be one of my patches I conflict with :| Created 5 years, 7 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 (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/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/mac/foundation_util.h" 8 #include "base/mac/foundation_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" 12 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
14 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 14 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
15 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 15 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
16 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" 16 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
17 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 17 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
18 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 18 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
19 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
20 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
21 #import "chrome/browser/ui/cocoa/info_bubble_window.h" 19 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
22 #import "chrome/browser/ui/cocoa/themed_window.h" 20 #import "chrome/browser/ui/cocoa/themed_window.h"
23 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 21 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
22 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
24 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 23 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
25 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 24 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
26 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
27 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
28 #include "ui/base/theme_provider.h" 27 #include "ui/base/theme_provider.h"
29 #include "ui/gfx/geometry/rect.h" 28 #include "ui/gfx/geometry/rect.h"
30 #include "ui/gfx/geometry/size.h" 29 #include "ui/gfx/geometry/size.h"
31 30
32 namespace { 31 namespace {
33 32
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() { 224 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
226 return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize])); 225 return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize]));
227 } 226 }
228 227
229 BrowserActionTestUtil::BrowserActionTestUtil(Browser* browser, 228 BrowserActionTestUtil::BrowserActionTestUtil(Browser* browser,
230 BrowserActionTestUtil* main_bar) 229 BrowserActionTestUtil* main_bar)
231 : browser_(browser), 230 : browser_(browser),
232 test_helper_(new TestToolbarActionsBarHelperCocoa( 231 test_helper_(new TestToolbarActionsBarHelperCocoa(
233 browser_, GetController(browser_, main_bar->test_helper_.get()))) { 232 browser_, GetController(browser_, main_bar->test_helper_.get()))) {
234 } 233 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698