5 files changed, 18 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 605e740..5dfeb0c 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -122,6 +122,10 @@ const char kDisableAudio[]                  = "disable-audio";
 const char kDisableAuthNegotiateCnameLookup[] =
     "disable-auth-negotiate-cname-lookup";
 
+// Disable background mode (background apps will not keep chrome running in the
+// background) - used when running tests involving background apps.
+const char kDisableBackgroundMode[] = "disable-background-mode";
+
 // Disable limits on the number of backing stores. Can prevent blinking for
 // users with many windows/tabs and lots of memory.
 const char kDisableBackingStoreLimit[]      = "disable-backing-store-limit";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index bf1b4b7..770f6d9 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -49,6 +49,7 @@ extern const char kDisableApplicationCache[];
 extern const char kDisableApps[];
 extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
+extern const char kDisableBackgroundMode[];
 extern const char kDisableBackingStoreLimit[];
 extern const char kDisableByteRangeSupport[];
 extern const char kDisableContentPrefetch[];
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 48871b4..252f70d 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -787,6 +787,13 @@ class NotificationType {
     // details about why the install failed.
     EXTENSION_INSTALL_ERROR,
 
+    // Sent when a new extension is being uninstalled. When this notification
+    // is sent, the ExtensionsService still is tracking this extension (it has
+    // not been unloaded yet). This will be followed by an EXTENSION_UNLOADED
+    // or EXTENSION_UNLOADED_DISABLED when the extension is actually unloaded.
+    // The details are an Extension and the source is a Profile.
+    EXTENSION_UNINSTALLED,
+
     // Sent when an extension is unloaded. This happens when an extension is
     // uninstalled or disabled. The details are an Extension, and the source is
     // a Profile.
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 40183d1..02f92424 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -687,6 +687,10 @@ const char kPreferencesWindowPlacement[] = "preferences.window_placement";
 // renderer's in-memory cache of objects.
 const char kMemoryCacheSize[] = "renderer.memory_cache.size";
 
+// Boolean that records if chrome should run in background mode when background
+// apps are installed.
+const char kBackgroundModeEnabled[] = "background_mode.enabled";
+
 // String which specifies where to download files to by default.
 const char kDownloadDefaultDirectory[] = "download.default_directory";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index f27005a..18503a0 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -250,6 +250,8 @@ extern const char kKeywordEditorWindowPlacement[];
 extern const char kPreferencesWindowPlacement[];
 extern const char kMemoryCacheSize[];
 
+extern const char kBackgroundModeEnabled[];
+
 extern const char kDownloadDefaultDirectory[];
 extern const char kDownloadExtensionsToOpen[];
 extern const char kDownloadDirUpgraded[];