Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: chrome/browser/extensions/extension_prefs.cc

Issue 14990002: Make sure keybindings removed don't come back during extension update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moving API calls out of ExtensionPrefs class Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_prefs.h" 5 #include "chrome/browser/extensions/extension_prefs.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_notifier.h" 8 #include "base/prefs/pref_notifier.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 const char kPrefCreationFlags[] = "creation_flags"; 177 const char kPrefCreationFlags[] = "creation_flags";
178 178
179 // A preference that indicates whether the extension was installed from the 179 // A preference that indicates whether the extension was installed from the
180 // Chrome Web Store. 180 // Chrome Web Store.
181 const char kPrefFromWebStore[] = "from_webstore"; 181 const char kPrefFromWebStore[] = "from_webstore";
182 182
183 // A preference that indicates whether the extension was installed from a 183 // A preference that indicates whether the extension was installed from a
184 // mock App created from a bookmark. 184 // mock App created from a bookmark.
185 const char kPrefFromBookmark[] = "from_bookmark"; 185 const char kPrefFromBookmark[] = "from_bookmark";
186 186
187 // A prefrence that indicates whethere the extension was installed as 187 // A preference that indicates whether the extension was installed as
188 // default apps. 188 // default apps.
189 const char kPrefWasInstalledByDefault[] = "was_installed_by_default"; 189 const char kPrefWasInstalledByDefault[] = "was_installed_by_default";
190 190
191 // A preference that contains any extension-controlled preferences. 191 // A preference that contains any extension-controlled preferences.
192 const char kPrefPreferences[] = "preferences"; 192 const char kPrefPreferences[] = "preferences";
193 193
194 // A preference that contains any extension-controlled incognito preferences. 194 // A preference that contains any extension-controlled incognito preferences.
195 const char kPrefIncognitoPreferences[] = "incognito_preferences"; 195 const char kPrefIncognitoPreferences[] = "incognito_preferences";
196 196
197 // A preference that contains any extension-controlled regular-only preferences. 197 // A preference that contains any extension-controlled regular-only preferences.
(...skipping 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 is_enabled = initial_state == Extension::ENABLED; 2248 is_enabled = initial_state == Extension::ENABLED;
2249 } 2249 }
2250 2250
2251 extension_pref_value_map_->RegisterExtension(extension_id, install_time, 2251 extension_pref_value_map_->RegisterExtension(extension_id, install_time,
2252 is_enabled); 2252 is_enabled);
2253 content_settings_store_->RegisterExtension(extension_id, install_time, 2253 content_settings_store_->RegisterExtension(extension_id, install_time,
2254 is_enabled); 2254 is_enabled);
2255 } 2255 }
2256 2256
2257 } // namespace extensions 2257 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/commands/command_service_browsertest.cc ('k') | chrome/browser/ui/views/browser_action_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698