Support global keyboard commands on Chrome OS.

chrome/common/extensions/command.cc

 // Copyright (c) 2012 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/common/extensions/command.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 namespace keys = manifest_keys;
 namespace values = manifest_values;
 
@@ skipping 415 matching lines @@
         !suggested_key_string.empty()) {
       // If only a single string is provided, it must be default for all.
       suggestions[values::kKeybindingPlatformDefault] = suggested_key_string;
     } else {
       suggestions[values::kKeybindingPlatformDefault] = "";
     }
   }
 
   // Check if this is a global or a regular shortcut.
   bool global = false;
-  if (FeatureSwitch::global_commands()->IsEnabled())
-    command->GetBoolean(keys::kGlobal, &global);
+  command->GetBoolean(keys::kGlobal, &global);
 
   // Normalize the suggestions.
   for (SuggestionMap::iterator iter = suggestions.begin();
        iter != suggestions.end(); ++iter) {
     // Before we normalize Ctrl to Command we must detect when the developer
     // specified Command in the Default section, which will work on Mac after
     // normalization but only fail on other platforms when they try it out on
     // other platforms, which is not what we want.
     if (iter->first == values::kKeybindingPlatformDefault &&
         iter->second.find("Command+") != std::string::npos) {
@@ skipping 70 matching lines @@
   } else {
     command_description = description();
   }
   extension_data->SetString("description", command_description);
   extension_data->SetBoolean("active", active);
   extension_data->SetString("keybinding", accelerator().GetShortcutText());
   extension_data->SetString("command_name", command_name());
   extension_data->SetString("extension_id", extension->id());
   extension_data->SetBoolean("global", global());
   extension_data->SetBoolean("extension_action", extension_action);
-
-  if (FeatureSwitch::global_commands()->IsEnabled())
-    extension_data->SetBoolean("scope_ui_visible", true);
-
+  extension_data->SetBoolean("scope_ui_visible", true);

[Finnur, 2014/06/27 11:10:57]

Please remove this boolean assignment as well, and delete lines 290 and 267 from
this file:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/res...

And, as a sanity test, make sure the Chrome/Global combo box on the config UI
for shortcuts still works after that change.

[David Tseng, 2014/06/28 14:17:50]

Removed ln 267 and 291, and removed the boolean assignment here.

   return extension_data;
 }
 
 }  // namespace extensions