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

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

Issue 10882024: Add webui handler for promotions on Android NTP. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Removing images (added separately in https://chromiumcodereview.appspot.com/10905035/) Created 8 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/resources/ntp_android/new_tab.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #endif 104 #endif
105 105
106 #if defined(USE_ASH) 106 #if defined(USE_ASH)
107 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 107 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
108 #endif 108 #endif
109 109
110 #if !defined(OS_ANDROID) 110 #if !defined(OS_ANDROID)
111 #include "chrome/browser/chrome_to_mobile_service.h" 111 #include "chrome/browser/chrome_to_mobile_service.h"
112 #endif 112 #endif
113 113
114 #if defined(OS_ANDROID)
115 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
116 #endif
117
114 namespace { 118 namespace {
115 119
116 enum MigratedPreferences { 120 enum MigratedPreferences {
117 NO_PREFS = 0, 121 NO_PREFS = 0,
118 DNS_PREFS = 1 << 0, 122 DNS_PREFS = 1 << 0,
119 WINDOWS_PREFS = 1 << 1, 123 WINDOWS_PREFS = 1 << 1,
120 GOOGLE_URL_TRACKER_PREFS = 1 << 2, 124 GOOGLE_URL_TRACKER_PREFS = 1 << 2,
121 }; 125 };
122 126
123 } // namespace 127 } // namespace
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 #if defined(TOOLKIT_VIEWS) 231 #if defined(TOOLKIT_VIEWS)
228 RegisterInvertBubbleUserPrefs(user_prefs); 232 RegisterInvertBubbleUserPrefs(user_prefs);
229 #elif defined(TOOLKIT_GTK) 233 #elif defined(TOOLKIT_GTK)
230 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 234 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
231 #endif 235 #endif
232 236
233 #if defined(OS_ANDROID) 237 #if defined(OS_ANDROID)
234 geolocation::RegisterUserPrefs(user_prefs); 238 geolocation::RegisterUserPrefs(user_prefs);
235 #endif 239 #endif
236 240
241 #if defined(OS_ANDROID)
242 PromoHandler::RegisterUserPrefs(user_prefs);
243 #endif
244
237 #if defined(USE_ASH) 245 #if defined(USE_ASH)
238 ash::RegisterChromeLauncherUserPrefs(user_prefs); 246 ash::RegisterChromeLauncherUserPrefs(user_prefs);
239 #endif 247 #endif
240 248
241 #if !defined(OS_ANDROID) 249 #if !defined(OS_ANDROID)
242 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); 250 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);
243 ChromeToMobileService::RegisterUserPrefs(user_prefs); 251 ChromeToMobileService::RegisterUserPrefs(user_prefs);
244 extensions::CommandService::RegisterUserPrefs(user_prefs); 252 extensions::CommandService::RegisterUserPrefs(user_prefs);
245 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 253 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
246 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 254 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 337 }
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 338 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
331 339
332 current_version |= GOOGLE_URL_TRACKER_PREFS; 340 current_version |= GOOGLE_URL_TRACKER_PREFS;
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 341 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
334 current_version); 342 current_version);
335 } 343 }
336 } 344 }
337 345
338 } // namespace chrome 346 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/ntp_android/new_tab.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698