diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 17:54:09 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 17:54:09 +0000 |
| commit | d743a598543343501ec40884ec8acb8f017cc6a1 (patch) | |
| tree | 2e0ec7f87dcc1c6c5f073a9b0d23294effd0fcd2 /chrome/common | |
| parent | fb3b1f899004d887a296b5a069dc46f11a8844b3 (diff) | |
| download | chromium_src-d743a598543343501ec40884ec8acb8f017cc6a1.zip chromium_src-d743a598543343501ec40884ec8acb8f017cc6a1.tar.gz chromium_src-d743a598543343501ec40884ec8acb8f017cc6a1.tar.bz2 | |
Remove chat manager component extension in favour of external extensions.
I originally added this in r60123 but over time it turned out that being a regular installed app will work out better.
BUG=none
TEST=chat manager should no longer be a component extension on Chrome OS builds
Review URL: http://codereview.chromium.org/4652002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/pref_names.cc | 4 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index f5d4836..9c91912 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -397,10 +397,6 @@ const char kLabsAdvancedFilesystemEnabled[] = // A boolean pref which turns on the mediaplayer. const char kLabsMediaplayerEnabled[] = "settings.labs.mediaplayer"; -// An integer pref which maps to the extension state for Talk. -const char kLabsTalkEnabled[] = - "extensions.settings.ggnioahjipcehijkhpdjekioddnjoben.state"; - // A boolean pref that turns on screen locker. const char kEnableScreenLock[] = "settings.enable_screen_lock"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 5799ec0..0d5275c 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -146,7 +146,6 @@ extern const char kLanguageXkbAutoRepeatInterval[]; extern const char kAccessibilityEnabled[]; extern const char kLabsAdvancedFilesystemEnabled[]; extern const char kLabsMediaplayerEnabled[]; -extern const char kLabsTalkEnabled[]; extern const char kEnableScreenLock[]; #endif extern const char kIpcDisabledMessages[]; |