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

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

Issue 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); 172 AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
173 AppsPromo::RegisterUserPrefs(user_prefs); 173 AppsPromo::RegisterUserPrefs(user_prefs);
174 AutofillManager::RegisterUserPrefs(user_prefs); 174 AutofillManager::RegisterUserPrefs(user_prefs);
175 bookmark_utils::RegisterUserPrefs(user_prefs); 175 bookmark_utils::RegisterUserPrefs(user_prefs);
176 BookmarkModel::RegisterUserPrefs(user_prefs); 176 BookmarkModel::RegisterUserPrefs(user_prefs);
177 ChromeVersionService::RegisterUserPrefs(user_prefs); 177 ChromeVersionService::RegisterUserPrefs(user_prefs);
178 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); 178 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
179 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); 179 chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
180 DownloadPrefs::RegisterUserPrefs(user_prefs); 180 DownloadPrefs::RegisterUserPrefs(user_prefs);
181 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 181 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
182 ExtensionCommandService::RegisterUserPrefs(user_prefs); 182 extensions::ExtensionCommandService::RegisterUserPrefs(user_prefs);
183 ExtensionPrefs::RegisterUserPrefs(user_prefs); 183 ExtensionPrefs::RegisterUserPrefs(user_prefs);
184 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 184 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
185 ExtensionWebUI::RegisterUserPrefs(user_prefs); 185 ExtensionWebUI::RegisterUserPrefs(user_prefs);
186 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); 186 GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
187 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 187 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
188 IncognitoModePrefs::RegisterUserPrefs(user_prefs); 188 IncognitoModePrefs::RegisterUserPrefs(user_prefs);
189 InstantController::RegisterUserPrefs(user_prefs); 189 InstantController::RegisterUserPrefs(user_prefs);
190 NetPrefObserver::RegisterPrefs(user_prefs); 190 NetPrefObserver::RegisterPrefs(user_prefs);
191 NewTabUI::RegisterUserPrefs(user_prefs); 191 NewTabUI::RegisterUserPrefs(user_prefs);
192 PasswordManager::RegisterUserPrefs(user_prefs); 192 PasswordManager::RegisterUserPrefs(user_prefs);
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 } 303 }
304 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 304 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
305 305
306 current_version |= GOOGLE_URL_TRACKER_PREFS; 306 current_version |= GOOGLE_URL_TRACKER_PREFS;
307 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 307 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
308 current_version); 308 current_version);
309 } 309 }
310 } 310 }
311 311
312 } // namespace browser 312 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698