diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 00:57:49 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 00:57:49 +0000 |
commit | 44b2c885548d647611d908309dfdf6306eac7ed8 (patch) | |
tree | c46fd5199ac07df770ca9b01a0b73dc594b6d63d /chrome/browser/cocoa/browser_test_helper.h | |
parent | 9eef357377e89bffd2d5ff9fad9de0c94d8cc934 (diff) | |
download | chromium_src-44b2c885548d647611d908309dfdf6306eac7ed8.zip chromium_src-44b2c885548d647611d908309dfdf6306eac7ed8.tar.gz chromium_src-44b2c885548d647611d908309dfdf6306eac7ed8.tar.bz2 |
Mac bookmark work.
- The bookmark menu is populated dynamically with bookmarks, including
subfolders --> submenus. E.g. star something --> shows up in menu.
Menu items are disabled but always present and current.
- Always Show Bookmarks" menu now live; reads from / writes to
preference, and shows correct "toggle state".
- Bookmark bar on each tab, present if requested. (Currently an empty box).
- Random stuff; e.g. bookmark prefs init moved to a x-plat location.
This CL does not contain Cole's views.
Bried english description of the nib file changes:
- add a new view for the bookmark bar in the tab; hook it up to the controller
- Many tag sets (e.g. View-->Always Show Bookmarks Bar now 40009)
- Remove dummy bookmark menu items
Review URL: http://codereview.chromium.org/46078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_test_helper.h')
-rw-r--r-- | chrome/browser/cocoa/browser_test_helper.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_test_helper.h b/chrome/browser/cocoa/browser_test_helper.h new file mode 100644 index 0000000..6427547 --- /dev/null +++ b/chrome/browser/cocoa/browser_test_helper.h @@ -0,0 +1,38 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/browser.h" +#include "chrome/browser/profile.h" +#include "chrome/test/testing_profile.h" + +// Base class which contains a valid Browser*. Lots of boilerplate to +// recycle between unit test classes. +// +// TODO(jrg): move up a level (chrome/browser/cocoa --> +// chrome/browser), and use in non-Mac unit tests such as +// back_forward_menu_model_unittest.cc, +// navigation_controller_unittest.cc, .. +class BrowserTestHelper { + public: + BrowserTestHelper() { + TestingProfile *testing_profile = new TestingProfile(); + testing_profile->CreateBookmarkModel(true); + testing_profile->BlockUntilBookmarkModelLoaded(); + profile_ = testing_profile; + browser_ = new Browser(Browser::TYPE_NORMAL, profile_); + } + + ~BrowserTestHelper() { + delete browser_; + delete profile_; + } + + Browser* GetBrowser() { return browser_; } + Profile* GetProfile() { return profile_; } + + private: + Browser* browser_; + Profile* profile_; + MessageLoopForUI message_loop_; +}; |