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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include "base/mac/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #import "base/mac/scoped_nsobject.h" 8 #import "base/mac/scoped_nsobject.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "chrome/app/chrome_command_ids.h" 11 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
16 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 16 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
17 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" 17 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
18 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 18 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
19 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 19 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
21 #include "chrome/browser/ui/host_desktop.h" 21 #include "chrome/browser/ui/host_desktop.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "chrome/test/base/testing_profile.h" 23 #include "chrome/test/base/testing_profile.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/test/test_utils.h" 25 #include "content/public/test/test_utils.h"
26 #include "testing/gmock/include/gmock/gmock.h" 26 #include "testing/gmock/include/gmock/gmock.h"
27 #import "testing/gtest_mac.h" 27 #import "testing/gtest_mac.h"
28 #import "third_party/ocmock/OCMock/OCMock.h" 28 #import "third_party/ocmock/OCMock/OCMock.h"
29 #include "ui/gfx/host_desktop_type.h"
29 30
30 using ::testing::Return; 31 using ::testing::Return;
31 32
32 @interface BrowserWindowController (JustForTesting) 33 @interface BrowserWindowController (JustForTesting)
33 // Already defined in BWC. 34 // Already defined in BWC.
34 - (void)saveWindowPositionIfNeeded; 35 - (void)saveWindowPositionIfNeeded;
35 - (void)layoutSubviews; 36 - (void)layoutSubviews;
36 @end 37 @end
37 38
38 @interface BrowserWindowController (ExposedForTesting) 39 @interface BrowserWindowController (ExposedForTesting)
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) 822 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
822 styleMask:NSBorderlessWindowMask 823 styleMask:NSBorderlessWindowMask
823 backing:NSBackingStoreBuffered 824 backing:NSBackingStoreBuffered
824 defer:NO]); 825 defer:NO]);
825 [[testFullscreenWindow_ contentView] setWantsLayer:YES]; 826 [[testFullscreenWindow_ contentView] setWantsLayer:YES];
826 return testFullscreenWindow_.get(); 827 return testFullscreenWindow_.get();
827 } 828 }
828 @end 829 @end
829 830
830 /* TODO(???): test other methods of BrowserWindowController */ 831 /* TODO(???): test other methods of BrowserWindowController */
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm ('k') | chrome/browser/ui/cocoa/cocoa_profile_test.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698