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

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

Issue 9521013: Remove web intents from Chrome on Android build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix buildbot compile errors Created 8 years, 9 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/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background/background_mode_manager.h" 9 #include "chrome/browser/background/background_mode_manager.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 NewTabUI::RegisterUserPrefs(user_prefs); 192 NewTabUI::RegisterUserPrefs(user_prefs);
193 PasswordManager::RegisterUserPrefs(user_prefs); 193 PasswordManager::RegisterUserPrefs(user_prefs);
194 PinnedTabCodec::RegisterUserPrefs(user_prefs); 194 PinnedTabCodec::RegisterUserPrefs(user_prefs);
195 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); 195 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
196 PrefsTabHelper::RegisterUserPrefs(user_prefs); 196 PrefsTabHelper::RegisterUserPrefs(user_prefs);
197 ProfileImpl::RegisterUserPrefs(user_prefs); 197 ProfileImpl::RegisterUserPrefs(user_prefs);
198 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); 198 ProtocolHandlerRegistry::RegisterPrefs(user_prefs);
199 SessionStartupPref::RegisterUserPrefs(user_prefs); 199 SessionStartupPref::RegisterUserPrefs(user_prefs);
200 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 200 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
201 TranslatePrefs::RegisterUserPrefs(user_prefs); 201 TranslatePrefs::RegisterUserPrefs(user_prefs);
202 web_intents::RegisterUserPrefs(user_prefs);
203 202
204 #if defined(ENABLE_CONFIGURATION_POLICY) 203 #if defined(ENABLE_CONFIGURATION_POLICY)
205 policy::URLBlacklistManager::RegisterPrefs(user_prefs); 204 policy::URLBlacklistManager::RegisterPrefs(user_prefs);
206 #endif 205 #endif
207 206
207 #if defined(ENABLE_WEB_INTENTS)
208 web_intents::RegisterUserPrefs(user_prefs);
209 #endif
210
208 #if defined(TOOLKIT_VIEWS) 211 #if defined(TOOLKIT_VIEWS)
209 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 212 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
210 #elif defined(TOOLKIT_GTK) 213 #elif defined(TOOLKIT_GTK)
211 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 214 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
212 #endif 215 #endif
213 216
214 #if defined(USE_ASH) 217 #if defined(USE_ASH)
215 ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); 218 ChromeLauncherDelegate::RegisterUserPrefs(user_prefs);
216 #endif 219 #endif
217 220
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 263 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
261 } 264 }
262 local_state->ClearPref(prefs::kBrowserWindowPlacement); 265 local_state->ClearPref(prefs::kBrowserWindowPlacement);
263 266
264 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 267 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
265 current_version | WINDOWS_PREFS); 268 current_version | WINDOWS_PREFS);
266 } 269 }
267 } 270 }
268 271
269 } // namespace browser 272 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/intents/register_intent_handler_helper.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698