diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 19:41:37 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 19:41:37 +0000 |
commit | cd63ef62b897937521c6943b554608b3f9349d27 (patch) | |
tree | c79b4ff66eb7d1553095a6389c41f85bca9f2051 /chrome/browser/cocoa/preferences_window_controller_unittest.mm | |
parent | 8e80744e557dd436dd174b7f7203b4409b90c6e4 (diff) | |
download | chromium_src-cd63ef62b897937521c6943b554608b3f9349d27.zip chromium_src-cd63ef62b897937521c6943b554608b3f9349d27.tar.gz chromium_src-cd63ef62b897937521c6943b554608b3f9349d27.tar.bz2 |
Implement most of the "basics" pref panel on Mac, including code to set the default browser. Fix up some related comments around the code.
Review URL: http://codereview.chromium.org/113032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15445 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/preferences_window_controller_unittest.mm')
-rw-r--r-- | chrome/browser/cocoa/preferences_window_controller_unittest.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller_unittest.mm b/chrome/browser/cocoa/preferences_window_controller_unittest.mm index 33bc12b..e276bf2 100644 --- a/chrome/browser/cocoa/preferences_window_controller_unittest.mm +++ b/chrome/browser/cocoa/preferences_window_controller_unittest.mm @@ -8,6 +8,7 @@ #import "chrome/browser/cocoa/preferences_window_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" +#include "chrome/common/pref_names.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -31,9 +32,13 @@ namespace { class PrefsControllerTest : public PlatformTest { public: PrefsControllerTest() { + // Since this is a platform-specific preference, it's not registered by + // any of the shared code. We have to register it ourselves. PrefService* prefs = browser_helper_.profile()->GetPrefs(); + prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); + pref_controller_.reset([[PreferencesWindowController alloc] - initWithPrefs:prefs]); + initWithProfile:browser_helper_.profile()]); EXPECT_TRUE(pref_controller_.get()); } @@ -46,8 +51,7 @@ class PrefsControllerTest : public PlatformTest { // making sure we get the notification when it's closed. TEST_F(PrefsControllerTest, ShowAndClose) { #if 0 -// TODO(pinkerton): this works locally, but fails on the buildbot. Need to -// investigate. +// TODO(pinkerton): this crashes deep w/in performClose:. Need to investigate. [pref_controller_ showPreferences:nil]; EXPECT_TRUE([[pref_controller_ window] isVisible]); |