Add pref to enable/disable palette tray.

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // Copyright 2015 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/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 507 matching lines @@
       {"keyRepeatRateFast", IDS_SETTINGS_KEYBOARD_AUTO_REPEAT_FAST},
       {"showKeyboardShortcutsOverlay",
        IDS_SETTINGS_KEYBOARD_SHOW_KEYBOARD_SHORTCUTS_OVERLAY},
       {"keyboardShowLanguageAndInput",
        IDS_SETTINGS_KEYBOARD_SHOW_LANGUAGE_AND_INPUT},
   };
   AddLocalizedStringsBulk(html_source, keyboard_strings,
                           arraysize(keyboard_strings));
 
   LocalizedString note_strings[] = {
-    {"noteTitle", IDS_SETTINGS_NOTE_TITLE},
-    {"noteDefaultAppAutoLaunch", IDS_SETTINGS_NOTE_DEFAULT_APP_AUTO_LAUNCH},
-    {"noteFindMoreApps", IDS_SETTINGS_NOTE_FIND_MORE_APPS}
-  };
+      {"noteTitle", IDS_SETTINGS_NOTE_TITLE},
+      {"noteEnableAshPalette", IDS_SETTINGS_NOTE_ENABLE_ASH_PALETTE},
+      {"noteDefaultAppAutoLaunch", IDS_SETTINGS_NOTE_DEFAULT_APP_AUTO_LAUNCH},
+      {"noteFindMoreApps", IDS_SETTINGS_NOTE_FIND_MORE_APPS}};
   AddLocalizedStringsBulk(html_source, note_strings,
                           arraysize(note_strings));
 
 
   LocalizedString display_strings[] = {
       {"devicePageTitle", IDS_SETTINGS_DEVICE_TITLE},
       {"displayTitle", IDS_SETTINGS_DISPLAY_TITLE},
       {"displayArrangement", IDS_SETTINGS_DISPLAY_ARRANGEMENT},
       {"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR},
       {"displayMakePrimary", IDS_SETTINGS_DISPLAY_MAKE_PRIMARY},
@@ skipping 882 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings