diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 22:57:33 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 22:57:33 +0000 |
| commit | 4b776890339f867a5ad1c946556434730d7ccb9c (patch) | |
| tree | c6b21cdfe8839506bfbb3d2e35eb3b3228b994fc /chrome/browser/browser.cc | |
| parent | 19d5175836dbf504a0f09bf75d2ff9c3434262d0 (diff) | |
| download | chromium_src-4b776890339f867a5ad1c946556434730d7ccb9c.zip chromium_src-4b776890339f867a5ad1c946556434730d7ccb9c.tar.gz chromium_src-4b776890339f867a5ad1c946556434730d7ccb9c.tar.bz2 | |
Enable tabbed bookmark manager by default.
Second try with the following changes:
- Remove FLAKY_ from Feed tests and makes sure they pass.
BUG=4890,38609
TEST=browser_test.exe
Run Chrome, Press Ctrl+Shift+B. The new bookmark manager should open in a tab.
Review URL: http://codereview.chromium.org/1127006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 42e0834..3b8346d 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1402,10 +1402,10 @@ void Browser::ToggleExtensionShelf() { void Browser::OpenBookmarkManager() { UserMetrics::RecordAction("ShowBookmarkManager", profile_); if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableTabbedBookmarkManager)) { - ShowBookmarkManagerTab(); - } else { + switches::kDisableTabbedBookmarkManager)) { window_->ShowBookmarkManager(); + } else { + ShowBookmarkManagerTab(); } } |