| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util_mac.h" | 5 #include "app/l10n_util_mac.h" |
| 6 #include "base/scoped_nsobject.h" | 6 #include "base/scoped_nsobject.h" |
| 7 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/browser_window.h" | 9 #include "chrome/browser/browser_window.h" |
| 10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) { | 83 TEST_F(BrowserWindowControllerTest, TestSaveWindowPosition) { |
| 84 PrefService* prefs = browser_helper_.profile()->GetPrefs(); | 84 PrefService* prefs = browser_helper_.profile()->GetPrefs(); |
| 85 ASSERT_TRUE(prefs != NULL); | 85 ASSERT_TRUE(prefs != NULL); |
| 86 | 86 |
| 87 // Check to make sure there is no existing pref for window placement. | 87 // Check to make sure there is no existing pref for window placement. |
| 88 ASSERT_TRUE(prefs->GetDictionary(prefs::kBrowserWindowPlacement) == NULL); | 88 ASSERT_TRUE(prefs->GetDictionary(prefs::kBrowserWindowPlacement) == NULL); |
| 89 | 89 |
| 90 // Ask the window to save its position, then check that a preference | 90 // Ask the window to save its position, then check that a preference |
| 91 // exists. | 91 // exists. We're technically passing in a pointer to the user prefs |
| 92 // and not the local state prefs, but a PrefService* is a |
| 93 // PrefService*, and this is a unittest. |
| 92 [controller_ saveWindowPositionToPrefs:prefs]; | 94 [controller_ saveWindowPositionToPrefs:prefs]; |
| 93 EXPECT_TRUE(prefs->GetDictionary(prefs::kBrowserWindowPlacement) != NULL); | 95 EXPECT_TRUE(prefs->GetDictionary(prefs::kBrowserWindowPlacement) != NULL); |
| 94 } | 96 } |
| 95 | 97 |
| 96 TEST_F(BrowserWindowControllerTest, TestFullScreenWindow) { | 98 TEST_F(BrowserWindowControllerTest, TestFullScreenWindow) { |
| 97 // Confirm that |-createFullscreenWindow| doesn't return nil. | 99 // Confirm that |-createFullscreenWindow| doesn't return nil. |
| 98 // See BrowserWindowFullScreenControllerTest for more fullscreen tests. | 100 // See BrowserWindowFullScreenControllerTest for more fullscreen tests. |
| 99 EXPECT_TRUE([controller_ createFullscreenWindow]); | 101 EXPECT_TRUE([controller_ createFullscreenWindow]); |
| 100 } | 102 } |
| 101 | 103 |
| (...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 657 fullscreenWindow_.reset( | 659 fullscreenWindow_.reset( |
| 658 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) | 660 [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400) |
| 659 styleMask:NSBorderlessWindowMask | 661 styleMask:NSBorderlessWindowMask |
| 660 backing:NSBackingStoreBuffered | 662 backing:NSBackingStoreBuffered |
| 661 defer:NO]); | 663 defer:NO]); |
| 662 return fullscreenWindow_.get(); | 664 return fullscreenWindow_.get(); |
| 663 } | 665 } |
| 664 @end | 666 @end |
| 665 | 667 |
| 666 /* TODO(???): test other methods of BrowserWindowController */ | 668 /* TODO(???): test other methods of BrowserWindowController */ |
| OLD | NEW |