summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 21:31:00 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 21:31:00 +0000
commitba8164244f0e273737f620a3364177990bbf8658 (patch)
tree3e426424d14b3b8b4dc3408b37c17f6221459d52 /chrome/browser
parent293fd7a9eb27dac7599a752e847c5b15f449519f (diff)
downloadchromium_src-ba8164244f0e273737f620a3364177990bbf8658.zip
chromium_src-ba8164244f0e273737f620a3364177990bbf8658.tar.gz
chromium_src-ba8164244f0e273737f620a3364177990bbf8658.tar.bz2
Removed Labs section from Chrome OS settings page.
BUG=chromium-os:9035 TEST=Go to chrome://settings and observe that there's no Labs section. Review URL: http://codereview.chromium.org/5025001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/about_flags.cc62
-rw-r--r--chrome/browser/about_flags_unittest.cc5
-rw-r--r--chrome/browser/chromeos/dom_ui/labs_handler.cc38
-rw-r--r--chrome/browser/chromeos/dom_ui/labs_handler.h24
-rw-r--r--chrome/browser/chromeos/usb_mount_observer.cc8
-rw-r--r--chrome/browser/dom_ui/filebrowse_ui.cc28
-rw-r--r--chrome/browser/dom_ui/mediaplayer_browsertest.cc14
-rw-r--r--chrome/browser/dom_ui/mediaplayer_ui.cc9
-rw-r--r--chrome/browser/dom_ui/options/options_ui.cc2
-rw-r--r--chrome/browser/resources/options.html30
-rw-r--r--chrome/browser/resources/options/chromeos_labs.html47
-rw-r--r--chrome/browser/tab_menu_model.cc3
12 files changed, 110 insertions, 160 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6c81dc3..0142205 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -24,6 +24,12 @@ namespace {
const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS;
+// Names for former Chrome OS Labs experiments, shared with prefs migration
+// code.
+const char kMediaPlayerExperimentName[] = "media-player";
+const char kAdvancedFileSystemExperimentName[] = "advanced-file-system";
+const char kVerticalTabsExperimentName[] = "vertical-tabs";
+
const Experiment kExperiments[] = {
{
"expose-for-tabs", // Do not change; see above.
@@ -38,12 +44,34 @@ const Experiment kExperiments[] = {
#endif
},
{
- "vertical-tabs", // Do not change; see above.
+ kMediaPlayerExperimentName,
+ IDS_FLAGS_MEDIA_PLAYER_NAME,
+ IDS_FLAGS_MEDIA_PLAYER_DESCRIPTION,
+ kOsCrOS,
+#if defined(OS_CHROMEOS)
+ // The switch exists only on Chrome OS.
+ switches::kEnableMediaPlayer
+#else
+ ""
+#endif
+ },
+ {
+ kAdvancedFileSystemExperimentName,
+ IDS_FLAGS_ADVANCED_FS_NAME,
+ IDS_FLAGS_ADVANCED_FS_DESCRIPTION,
+ kOsCrOS,
+#if defined(OS_CHROMEOS)
+ // The switch exists only on Chrome OS.
+ switches::kEnableAdvancedFileSystem
+#else
+ ""
+#endif
+ },
+ {
+ kVerticalTabsExperimentName,
IDS_FLAGS_SIDE_TABS_NAME,
IDS_FLAGS_SIDE_TABS_DESCRIPTION,
- // TODO(thakis): Move sidetabs to about:flags on ChromeOS
- // http://crbug.com/57634
- kOsWin,
+ kOsWin | kOsCrOS,
switches::kEnableVerticalTabs
},
{
@@ -221,6 +249,25 @@ class FlagsState {
DISALLOW_COPY_AND_ASSIGN(FlagsState);
};
+#if defined(OS_CHROMEOS)
+// Migrates Chrome OS Labs settings to experiments adding flags to enabled
+// experiment list if the corresponding pref is on.
+void MigrateChromeOSLabsPrefs(PrefService* prefs,
+ std::set<std::string>* result) {
+ DCHECK(prefs);
+ DCHECK(result);
+ if (prefs->GetBoolean(prefs::kLabsMediaplayerEnabled))
+ result->insert(kMediaPlayerExperimentName);
+ if (prefs->GetBoolean(prefs::kLabsAdvancedFilesystemEnabled))
+ result->insert(kAdvancedFileSystemExperimentName);
+ if (prefs->GetBoolean(prefs::kUseVerticalTabs))
+ result->insert(kVerticalTabsExperimentName);
+ prefs->SetBoolean(prefs::kLabsMediaplayerEnabled, false);
+ prefs->SetBoolean(prefs::kLabsAdvancedFilesystemEnabled, false);
+ prefs->SetBoolean(prefs::kUseVerticalTabs, false);
+}
+#endif
+
// Extracts the list of enabled lab experiments from preferences and stores them
// in a set.
void GetEnabledFlags(const PrefService* prefs, std::set<std::string>* result) {
@@ -380,6 +427,13 @@ void FlagsState::ConvertFlagsToSwitches(
return;
std::set<std::string> enabled_experiments;
+
+#if defined(OS_CHROMEOS)
+ // Some experiments were implemented via prefs on Chrome OS and we want to
+ // seamlessly migrate these prefs to about:flags for updated users.
+ MigrateChromeOSLabsPrefs(prefs, &enabled_experiments);
+#endif
+
GetSanitizedEnabledFlagsForCurrentPlatform(prefs, &enabled_experiments);
std::map<std::string, const Experiment*> experiment_map;
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 6d86cc9..f6b5193 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -52,6 +52,11 @@ class AboutFlagsTest : public ::testing::Test {
protected:
AboutFlagsTest() {
prefs_.RegisterListPref(prefs::kEnabledLabsExperiments);
+#if defined(OS_CHROMEOS)
+ prefs_.RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false);
+ prefs_.RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, false);
+ prefs_.RegisterBooleanPref(prefs::kUseVerticalTabs, false);
+#endif
testing::ClearState();
}
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.cc b/chrome/browser/chromeos/dom_ui/labs_handler.cc
deleted file mode 100644
index da605aa..0000000
--- a/chrome/browser/chromeos/dom_ui/labs_handler.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2010 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/chromeos/dom_ui/labs_handler.h"
-
-#include "app/l10n_util.h"
-#include "base/values.h"
-#include "grit/generated_resources.h"
-
-LabsHandler::LabsHandler() {
-}
-
-LabsHandler::~LabsHandler() {
-}
-
-void LabsHandler::GetLocalizedValues(
- DictionaryValue* localized_strings) {
- DCHECK(localized_strings);
- // Labs page - ChromeOS
- localized_strings->SetString("labsPage",
- l10n_util::GetStringUTF16(IDS_OPTIONS_LABS_TAB_LABEL));
-
- localized_strings->SetString("mediaplayer_title",
- l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_MEDIAPLAYER));
- localized_strings->SetString("mediaplayer",
- l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_MEDIAPLAYER_DESCRIPTION));
-
- localized_strings->SetString("advanced_file_title",
- l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADVANCEDFS));
- localized_strings->SetString("advanced_filesystem",
- l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_ADVANCEDFS_DESCRIPTION));
-
- localized_strings->SetString("side_tabs_title",
- l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_SIDE_TABS));
- localized_strings->SetString("side_tabs",
- l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SIDE_TABS_DESCRIPTION));
-}
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.h b/chrome/browser/chromeos/dom_ui/labs_handler.h
deleted file mode 100644
index 015a347..0000000
--- a/chrome/browser/chromeos/dom_ui/labs_handler.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2010 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
-#define CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
-#pragma once
-
-#include "chrome/browser/dom_ui/options/options_ui.h"
-
-// ChromeOS labs options page UI handler.
-class LabsHandler : public OptionsPageUIHandler {
- public:
- LabsHandler();
- virtual ~LabsHandler();
-
- // OptionsUIHandler implementation.
- virtual void GetLocalizedValues(DictionaryValue* localized_strings);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(LabsHandler);
-};
-
-#endif // CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
diff --git a/chrome/browser/chromeos/usb_mount_observer.cc b/chrome/browser/chromeos/usb_mount_observer.cc
index 3d0695f..b30cf1d 100644
--- a/chrome/browser/chromeos/usb_mount_observer.cc
+++ b/chrome/browser/chromeos/usb_mount_observer.cc
@@ -4,14 +4,14 @@
#include "chrome/browser/chromeos/usb_mount_observer.h"
+#include "base/command_line.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/dom_ui/filebrowse_ui.h"
-#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/pref_names.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
namespace chromeos {
@@ -59,8 +59,8 @@ void USBMountObserver::OpenFileBrowse(const std::string& url,
return;
}
profile = browser->profile();
- PrefService* pref_service = profile->GetPrefs();
- if (!pref_service->GetBoolean(prefs::kLabsAdvancedFilesystemEnabled)) {
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableAdvancedFileSystem)) {
return;
}
if (small) {
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 6abb3f0..855ba8e 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -7,6 +7,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -31,15 +32,14 @@
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/net/url_fetcher.h"
-#include "chrome/common/pref_names.h"
#include "chrome/common/time_format.h"
#include "chrome/common/url_constants.h"
#include "grit/browser_resources.h"
@@ -640,16 +640,10 @@ void FilebrowseHandler::EnqueueMediaFile(const ListValue* args) {
void FilebrowseHandler::HandleIsAdvancedEnabled(const ListValue* args) {
#if defined(OS_CHROMEOS)
- Browser* browser = BrowserList::GetLastActive();
- bool is_enabled = false;
- bool mp_enabled = false;
- if (browser) {
- Profile* profile = browser->profile();
- PrefService* pref_service = profile->GetPrefs();
- is_enabled = pref_service->GetBoolean(
- prefs::kLabsAdvancedFilesystemEnabled);
- mp_enabled = pref_service->GetBoolean(prefs::kLabsMediaplayerEnabled);
- }
+ bool is_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableAdvancedFileSystem);
+ bool mp_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableMediaPlayer);
DictionaryValue info_value;
info_value.SetBoolean("enabled", is_enabled);
info_value.SetBoolean("mpEnabled", mp_enabled);
@@ -1163,14 +1157,8 @@ Browser* FileBrowseUI::GetPopupForPath(const std::string& path,
Profile* profile) {
std::string current_path = path;
if (current_path.empty()) {
- Browser* browser = BrowserList::GetLastActive();
- if (browser == NULL) {
- return NULL;
- }
- Profile* profile = browser->profile();
- PrefService* pref_service = profile->GetPrefs();
- bool is_enabled = pref_service->GetBoolean(
- prefs::kLabsAdvancedFilesystemEnabled);
+ bool is_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableAdvancedFileSystem);
if (!is_enabled) {
FilePath default_download_path;
if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS,
diff --git a/chrome/browser/dom_ui/mediaplayer_browsertest.cc b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
index 1dcbfae..c90784a 100644
--- a/chrome/browser/dom_ui/mediaplayer_browsertest.cc
+++ b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/command_line.h"
#include "base/ref_counted.h"
#include "base/utf_string_conversions.h"
#include "chrome/test/automation/dom_element_proxy.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/dom_ui/mediaplayer_ui.h"
-#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/pref_names.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
@@ -22,6 +22,10 @@ class MediaPlayerBrowserTest : public InProcessBrowserTest {
public:
MediaPlayerBrowserTest() {}
+ virtual void SetUpCommandLine(CommandLine* command_line) {
+ command_line->AppendSwitch(switches::kEnableMediaPlayer);
+ }
+
GURL GetMusicTestURL() {
return GURL("http://localhost:1337/files/plugin/sample_mp3.mp3");
}
@@ -66,9 +70,6 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) {
ui_test_utils::NavigateToURL(browser(),
GURL("chrome://downloads"));
- PrefService* pref_service = browser()->profile()->GetPrefs();
- pref_service->SetBoolean(prefs::kLabsMediaplayerEnabled, true);
-
MediaPlayer* player = MediaPlayer::Get();
// Check that its not currently visible
ASSERT_FALSE(IsPlayerVisible());
@@ -85,9 +86,6 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, PopupPlaylist) {
GURL("chrome://downloads"));
- PrefService* pref_service = browser()->profile()->GetPrefs();
- pref_service->SetBoolean(prefs::kLabsMediaplayerEnabled, true);
-
MediaPlayer* player = MediaPlayer::Get();
player->EnqueueMediaURL(GetMusicTestURL(), NULL);
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc
index ca9b78b..74259c2 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/dom_ui/mediaplayer_ui.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/dom_ui/mediaplayer_ui.h"
#include "app/resource_bundle.h"
+#include "base/command_line.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/path_service.h"
@@ -25,14 +26,13 @@
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/net/url_fetcher.h"
-#include "chrome/common/pref_names.h"
#include "chrome/common/time_format.h"
#include "chrome/common/url_constants.h"
#include "grit/browser_resources.h"
@@ -381,9 +381,8 @@ void MediaPlayer::ForcePlayMediaURL(const GURL& url, Browser* creator) {
bool MediaPlayer::Enabled() {
#if defined(OS_CHROMEOS)
- Profile* profile = BrowserList::GetLastActive()->profile();
- PrefService* pref_service = profile->GetPrefs();
- return pref_service->GetBoolean(prefs::kLabsMediaplayerEnabled);
+ return CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableMediaPlayer);
#else
return true;
#endif
diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc
index 009c0e1..44d3b5d 100644
--- a/chrome/browser/dom_ui/options/options_ui.cc
+++ b/chrome/browser/dom_ui/options/options_ui.cc
@@ -58,7 +58,6 @@
#include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h"
#include "chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h"
#include "chrome/browser/chromeos/dom_ui/internet_options_handler.h"
-#include "chrome/browser/chromeos/dom_ui/labs_handler.h"
#include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h"
#include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h"
#include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
@@ -162,7 +161,6 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
AddOptionsPageUIHandler(localized_strings,
new chromeos::AccountsOptionsHandler());
AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
- AddOptionsPageUIHandler(localized_strings, new LabsHandler());
AddOptionsPageUIHandler(localized_strings,
new chromeos::LanguageChewingOptionsHandler());
AddOptionsPageUIHandler(localized_strings,
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index dc47e93..d1ca55d 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -226,12 +226,24 @@ function load() {
if (cr.isChromeOS) {
OptionsPage.register(AccountsOptions.getInstance());
- var labsOptions = new OptionsPage('labs',
- localStrings.getString('labsPage'),
- 'labsPage');
- OptionsPage.register(labsOptions);
- OptionsPage.registerSubPage(ProxyOptions.getInstance(),
- InternetOptions.getInstance());
+ OptionsPage.registerSubPage(LanguageOptions.getInstance());
+ OptionsPage.registerSubPage(new OptionsPage(
+ 'languageChewing',
+ localStrings.getString('languageChewingPage'),
+ 'languageChewingPage'));
+ OptionsPage.registerSubPage(new OptionsPage(
+ 'languageHangul',
+ localStrings.getString('languageHangulPage'),
+ 'languageHangulPage'));
+ OptionsPage.registerSubPage(new OptionsPage(
+ 'languageMozc',
+ localStrings.getString('languageMozcPage'),
+ 'languageMozcPage'));
+ OptionsPage.registerSubPage(new OptionsPage(
+ 'languagePinyin',
+ localStrings.getString('languagePinyinPage'),
+ 'languagePinyinPage'));
+ OptionsPage.registerSubPage(ProxyOptions.getInstance());
OptionsPage.registerOverlay(new OptionsPage(
'detailsInternetPage',
'detailsInternetPage',
@@ -331,7 +343,11 @@ window.onpopstate = function(e) {
<if expr="pp_ifdef('chromeos')">
<include src="options/chromeos_system_options.html">
<include src="options/chromeos_internet_options.html">
- <include src="options/chromeos_labs.html">
+ <include src="options/chromeos_language_options.html">
+ <include src="options/chromeos_language_chewing_options.html">
+ <include src="options/chromeos_language_hangul_options.html">
+ <include src="options/chromeos_language_mozc_options.html">
+ <include src="options/chromeos_language_pinyin_options.html">
<include src="options/chromeos_accounts_options.html">
</if>
<include src="options/advanced_options.html">
diff --git a/chrome/browser/resources/options/chromeos_labs.html b/chrome/browser/resources/options/chromeos_labs.html
deleted file mode 100644
index 56f6619..0000000
--- a/chrome/browser/resources/options/chromeos_labs.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="page hidden" id="labsPage">
- <h1 i18n-content="labsPage"></h1>
- <section>
- <h3 i18n-content="mediaplayer_title"></h3>
- <div class="option">
- <table class="option-control-table">
- <tr>
- <td class="option-name">
- <label class="checkbox">
- <input id="mediaplayer-check" pref="settings.labs.mediaplayer"
- type="checkbox">
- <span i18n-content="mediaplayer"></span>
- </label>
- </td>
- </tr>
- </table>
- </div>
- </section>
- <section>
- <h3 i18n-content="advanced_file_title"></h3>
- <div class="option">
- <table class="option-control-table">
- <tr>
- <td class="option-name">
- <label class="checkbox">
- <input id="advanced-filesystem-check"
- pref="settings.labs.advanced_filesystem" type="checkbox">
- <span i18n-content="advanced_filesystem"></span>
- </label>
- </td>
- </tr>
- </table>
- </div>
- </section>
- <section>
- <h3 i18n-content="side_tabs_title"></h3>
- <div class="option">
- <table class="option-control-table">
- <tr>
- <td class="option-name"><label><input id="side-tabs-check"
- pref="tabs.use_vertical_tabs" type="checkbox"><span
- i18n-content="side_tabs"></span></label></td>
- </tr>
- </table>
- </div>
- </section>
-</div>
diff --git a/chrome/browser/tab_menu_model.cc b/chrome/browser/tab_menu_model.cc
index 801f9dc..6189080 100644
--- a/chrome/browser/tab_menu_model.cc
+++ b/chrome/browser/tab_menu_model.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
#include "grit/generated_resources.h"
TabMenuModel::TabMenuModel(menus::SimpleMenuModel::Delegate* delegate,
@@ -17,7 +18,7 @@ TabMenuModel::TabMenuModel(menus::SimpleMenuModel::Delegate* delegate,
// static
bool TabMenuModel::AreVerticalTabsEnabled() {
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
+#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
return CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableVerticalTabs);
#else