4 files changed, 49 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/advanced_options_handler.cc
index d30b7cf..9c743c4 100644
--- a/chrome/browser/dom_ui/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/advanced_options_handler.cc
@@ -7,6 +7,7 @@
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/dom_ui/options_managed_banner_handler.h"
@@ -22,6 +23,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/chrome_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -121,6 +123,21 @@ void AdvancedOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE));
   localized_strings->SetString("translateEnableTranslate",
       l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE));
+  // Add ChromeApps preferences if background mode is runtime-enabled.
+  bool background_mode_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBackgroundMode);
+  localized_strings->SetString("enable-background-mode",
+      background_mode_enabled ? "true" : "false");
+  localized_strings->SetString("advancedSectionTitleChromeApps",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_ADVANCED_SECTION_TITLE_CHROME_APPS));
+  localized_strings->SetString("chromeAppsEnableBackgroundMode",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_CHROME_APPS_ENABLE_BACKGROUND_MODE));
+  localized_strings->SetString("chromeAppsLearnMoreBackgroundModeLabel",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_LEARN_MORE_LABEL));
+  localized_strings->SetString("chromeAppsLearnMoreBackgroundModeURL",
+      l10n_util::GetStringUTF16(IDS_LEARN_MORE_BACKGROUND_MODE_URL));
   localized_strings->SetString("enableLogging",
       l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING));
   localized_strings->SetString("disableServices",
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index ab432cc..74cd3bc 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -1,5 +1,8 @@
 <!DOCTYPE HTML>
-<html i18n-values="dir:textdirection;" id="t">
+<html
+    i18n-values="dir:textdirection;
+                 enable-background-mode:enable-background-mode"
+    id="t">
 <head>
 <meta charset="utf-8">
 <title i18n-content="title"></title>
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 2d87697..103dd5d 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -128,6 +128,21 @@
 <if expr="not pp_ifdef('chromeos')">
     </div>
   </section>
+  <section id="background-mode-section">
+    <h3 i18n-content="advancedSectionTitleChromeApps"></h3>
+    <div>
+      <label class="multi-line-wrap">
+        <input pref="background_mode.enabled"
+            metric="Options_BackgroundMode" type="checkbox">
+        <span i18n-content="chromeAppsEnableBackgroundMode"></span>
+      </label>
+      <div>
+        <a target="_blank"
+            i18n-content="chromeAppsLearnMoreBackgroundModeLabel"
+            i18n-values="href:chromeAppsLearnMoreBackgroundModeURL"></a>
+      </div>
+    </div>
+  </section>
   <div class="button-strip">
     <button id="optionsReset" i18n-content="optionsReset"></button>
   </div>
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 9b85b8a..c5836ce 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -316,3 +316,16 @@ list > .heading:hover {
 html[dir=rtl] .favicon-cell {
   background-position: right;
 }
+
+html[enable-background-mode=false] #background-mode-section {
+ display: none;
+}
+
+.multi-line-wrap input {
+  position: absolute;
+}
+
+.multi-line-wrap span {
+  -webkit-margin-start: 20px;
+  display: block;
+}