diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 17:59:18 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 17:59:18 +0000 |
commit | 28b180310c12025dffd454c3a5b1a2c409ac9509 (patch) | |
tree | 5294e512c67a03ec89c32098114e6ba880b84446 /chrome/browser/extensions/extension_prefs.cc | |
parent | 224c0ad4d0d66825b957812a06c0e65d8d811ea7 (diff) | |
download | chromium_src-28b180310c12025dffd454c3a5b1a2c409ac9509.zip chromium_src-28b180310c12025dffd454c3a5b1a2c409ac9509.tar.gz chromium_src-28b180310c12025dffd454c3a5b1a2c409ac9509.tar.bz2 |
Makes the toolbar visible for apps again. Here's the set of patches I
reverted: 49016, 47119, 47177, 46930, 46775, and the UI changes for
45566. If you see anything missing, please let me know.
Also, there are some grd strings no longer necessary. I'll nuke those
separately.
BUG=49013
TEST=none
Review URL: http://codereview.chromium.org/2888020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_prefs.cc')
-rw-r--r-- | chrome/browser/extensions/extension_prefs.cc | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index 93f29c4..ed44ec4 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -35,9 +35,6 @@ const wchar_t kPrefVersion[] = L"manifest.version"; // Indicates if an extension is blacklisted: const wchar_t kPrefBlacklist[] = L"blacklist"; -// Indicates whether the toolbar should be shown on app tabs. -const wchar_t kPrefAppTabToolbars[] = L"app_tab_toolbars"; - // Indicates whether to show an install warning when the user enables. const wchar_t kExtensionDidEscalatePermissions[] = L"install_warning_on_enable"; @@ -780,32 +777,6 @@ std::set<std::string> ExtensionPrefs::GetIdleInstallInfoIds() { return result; } -bool ExtensionPrefs::AreAppTabToolbarsVisible( - const std::string& extension_id) { - // Default to hiding toolbars. - bool show_toolbars = false; - DictionaryValue* pref = GetExtensionPref(extension_id); - if (!pref) - return show_toolbars; - - pref->GetBoolean( - ASCIIToWide(extension_id) + L"." + kPrefAppTabToolbars, &show_toolbars); - return show_toolbars; -} - -void ExtensionPrefs::SetAppTabToolbarVisibility( - const std::string& extension_id, bool value) { - DictionaryValue* pref = GetOrCreateExtensionPref(extension_id); - std::wstring key = ASCIIToWide(extension_id) + L"." + kPrefAppTabToolbars; - - if (value) - pref->SetBoolean(key, true); - else - pref->Remove(key, NULL); // False is the default value. - - prefs_->ScheduleSavePersistentPrefs(); -} - // static void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) { |