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

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: Rebase. 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
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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 #if defined(TOOLKIT_VIEWS) 229 #if defined(TOOLKIT_VIEWS)
226 RegisterInvertBubbleUserPrefs(user_prefs); 230 RegisterInvertBubbleUserPrefs(user_prefs);
227 #elif defined(TOOLKIT_GTK) 231 #elif defined(TOOLKIT_GTK)
228 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 232 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
229 #endif 233 #endif
230 234
231 #if defined(OS_ANDROID) 235 #if defined(OS_ANDROID)
232 geolocation::RegisterUserPrefs(user_prefs); 236 geolocation::RegisterUserPrefs(user_prefs);
233 #endif 237 #endif
234 238
239 #if defined(OS_ANDROID)
240 PromoHandler::RegisterUserPrefs(user_prefs);
241 #endif
242
235 #if defined(USE_ASH) 243 #if defined(USE_ASH)
236 ash::RegisterChromeLauncherUserPrefs(user_prefs); 244 ash::RegisterChromeLauncherUserPrefs(user_prefs);
237 #endif 245 #endif
238 246
239 #if !defined(OS_ANDROID) 247 #if !defined(OS_ANDROID)
240 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); 248 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);
241 ChromeToMobileService::RegisterUserPrefs(user_prefs); 249 ChromeToMobileService::RegisterUserPrefs(user_prefs);
242 extensions::CommandService::RegisterUserPrefs(user_prefs); 250 extensions::CommandService::RegisterUserPrefs(user_prefs);
243 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 251 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
244 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 252 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 } 335 }
328 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 336 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
329 337
330 current_version |= GOOGLE_URL_TRACKER_PREFS; 338 current_version |= GOOGLE_URL_TRACKER_PREFS;
331 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 339 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
332 current_version); 340 current_version);
333 } 341 }
334 } 342 }
335 343
336 } // namespace chrome 344 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/ntp_android/new_tab.html » ('j') | chrome/browser/resources/ntp_android/ntp_android.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698