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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 11348046: Add versioning to PluginFinder metadata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos Created 7 years, 10 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 #if !defined(OS_ANDROID) 129 #if !defined(OS_ANDROID)
130 #include "chrome/browser/chrome_to_mobile_service.h" 130 #include "chrome/browser/chrome_to_mobile_service.h"
131 #endif 131 #endif
132 132
133 #if defined(OS_ANDROID) 133 #if defined(OS_ANDROID)
134 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" 134 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
135 #endif 135 #endif
136 136
137 #if defined(ENABLE_PLUGIN_INSTALLATION) 137 #if defined(ENABLE_PLUGIN_INSTALLATION)
138 #include "chrome/browser/web_resource/plugins_resource_service.h" 138 #include "chrome/browser/plugins/plugins_resource_service.h"
139 #endif 139 #endif
140 140
141 namespace { 141 namespace {
142 142
143 enum MigratedPreferences { 143 enum MigratedPreferences {
144 NO_PREFS = 0, 144 NO_PREFS = 0,
145 DNS_PREFS = 1 << 0, 145 DNS_PREFS = 1 << 0,
146 WINDOWS_PREFS = 1 << 1, 146 WINDOWS_PREFS = 1 << 1,
147 GOOGLE_URL_TRACKER_PREFS = 1 << 2, 147 GOOGLE_URL_TRACKER_PREFS = 1 << 2,
148 }; 148 };
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 415 }
416 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 416 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
417 417
418 current_version |= GOOGLE_URL_TRACKER_PREFS; 418 current_version |= GOOGLE_URL_TRACKER_PREFS;
419 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 419 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
420 current_version); 420 current_version);
421 } 421 }
422 } 422 }
423 423
424 } // namespace chrome 424 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugins_resource_service.cc ('k') | chrome/browser/resources/plugin_metadata/plugins_chromeos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698