summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-20 00:19:19 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-20 00:19:19 +0000
commit02b0702ddbc1ffdea4dffcedd4d70274f1be38fa (patch)
tree71aa3cde9ef5b5a115575b666faf7f32bd483f9a /chrome/browser/browser.cc
parent71cbae7bdfed9c023c21c37bf4551a8d18dfa3d2 (diff)
downloadchromium_src-02b0702ddbc1ffdea4dffcedd4d70274f1be38fa.zip
chromium_src-02b0702ddbc1ffdea4dffcedd4d70274f1be38fa.tar.gz
chromium_src-02b0702ddbc1ffdea4dffcedd4d70274f1be38fa.tar.bz2
Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs mode.
Reliability bot and Linux CrOS browser_tests all had crashes in ~TabStrip. BUG=none TEST=none Review URL: http://codereview.chromium.org/1141005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 3b8346d..f2779af 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -190,7 +190,6 @@ Browser::Browser(Type type, Profile* profile)
encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
profile_->GetPrefs(), NULL);
- use_vertical_tabs_.Init(prefs::kUseVerticalTabs, profile_->GetPrefs(), this);
}
Browser::~Browser() {
@@ -1567,7 +1566,7 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
- prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false);
+ prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, true);
prefs->RegisterBooleanPref(prefs::kEnableTranslate, true);
}
@@ -1995,15 +1994,6 @@ void Browser::BookmarkAllTabs() {
BookmarkEditor::SHOW_TREE, NULL);
}
-bool Browser::UseVerticalTabs() const {
- return use_vertical_tabs_.GetValue();
-}
-
-void Browser::ToggleUseVerticalTabs() {
- use_vertical_tabs_.SetValue(!UseVerticalTabs());
- window()->ToggleTabStripMode();
-}
-
///////////////////////////////////////////////////////////////////////////////
// Browser, TabStripModelObserver implementation: