diff options
author | afakhry <afakhry@chromium.org> | 2015-07-31 11:00:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-31 18:01:26 +0000 |
commit | 3920b7273eca34d1108b048f1eec3fd573b86524 (patch) | |
tree | 68e24358293049350269114a3a2d80138c91dbbd | |
parent | e1ecd6271f376ccbb7306369664fdeb489dea557 (diff) | |
download | chromium_src-3920b7273eca34d1108b048f1eec3fd573b86524.zip chromium_src-3920b7273eca34d1108b048f1eec3fd573b86524.tar.gz chromium_src-3920b7273eca34d1108b048f1eec3fd573b86524.tar.bz2 |
Remove the no-longer-used chromeos::switches::kHasChromeOSKeyboard
The last usage of this switch was removed in this CL:
https://codereview.chromium.org/1188693002/. We don't need to keep it
around.
BUG=501121
Review URL: https://codereview.chromium.org/1269793005
Cr-Commit-Position: refs/heads/master@{#341364}
-rw-r--r-- | chrome/browser/chromeos/events/event_rewriter_unittest.cc | 7 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/chrome_restart_request.cc | 1 | ||||
-rw-r--r-- | chromeos/chromeos_switches.cc | 4 | ||||
-rw-r--r-- | chromeos/chromeos_switches.h | 1 |
4 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc index 3e5b5a9..23e06aa 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc @@ -2567,8 +2567,6 @@ TEST_F(EventRewriterTest, TestRewriteFunctionKeys) { } TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) { - const base::CommandLine original_cl(*base::CommandLine::ForCurrentProcess()); - // Remap Search to Control. TestingPrefServiceSyncable prefs; chromeos::Preferences::RegisterProfilePrefs(prefs.registry()); @@ -2580,9 +2578,6 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) { rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); rewriter.set_pref_service_for_testing(&prefs); - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( - chromeos::switches::kHasChromeOSKeyboard, ""); - KeyTestCase tests[] = { // Alt+Search+Down -> End {ui::ET_KEY_PRESSED, @@ -2606,8 +2601,6 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) { for (const auto& test : tests) { CheckKeyTestCase(&rewriter, test); } - - *base::CommandLine::ForCurrentProcess() = original_cl; } TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) { diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc index 48378e3..9821fb8 100644 --- a/chrome/browser/chromeos/login/chrome_restart_request.cc +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc @@ -216,7 +216,6 @@ std::string DeriveCommandLine(const GURL& start_url, chromeos::switches::kEnableConsumerManagement, chromeos::switches::kEnterpriseEnableForcedReEnrollment, chromeos::switches::kHasChromeOSDiamondKey, - chromeos::switches::kHasChromeOSKeyboard, chromeos::switches::kLoginProfile, chromeos::switches::kNaturalScrollDefault, chromeos::switches::kSystemInDevMode, diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index bc16326..6152890 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -185,10 +185,6 @@ const char kGuestSession[] = "bwsi"; const char kGuestWallpaperLarge[] = "guest-wallpaper-large"; const char kGuestWallpaperSmall[] = "guest-wallpaper-small"; -// If true, the Chromebook has a Chrome OS keyboard. Don't use the flag for -// Chromeboxes. -const char kHasChromeOSKeyboard[] = "has-chromeos-keyboard"; - // If true, the Chromebook has a keyboard with a diamond key. const char kHasChromeOSDiamondKey[] = "has-chromeos-diamond-key"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index c419617..419fca3 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -77,7 +77,6 @@ CHROMEOS_EXPORT extern const char kGuestSession[]; CHROMEOS_EXPORT extern const char kGuestWallpaperLarge[]; CHROMEOS_EXPORT extern const char kGuestWallpaperSmall[]; CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[]; -CHROMEOS_EXPORT extern const char kHasChromeOSKeyboard[]; CHROMEOS_EXPORT extern const char kHomedir[]; CHROMEOS_EXPORT extern const char kHostPairingOobe[]; CHROMEOS_EXPORT extern const char kIgnoreUserProfileMappingForTests[]; |