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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 9836103: Fix most remaining WebUI link errors on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index da305a6de1320090366693a7581d8c6bcaf50d01..3a21aa83e3ad90550862699cb3b15eb0d2b288c4 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -704,6 +704,7 @@ void ProfileSyncService::OnDataTypesChanged(
// Received notice to enable experimental type. Check if the type is
// registered, and if not register a new datatype controller.
RegisterNewDataType(it.Get());
+#if !defined(OS_ANDROID)
// Enable the about:flags switch for the experimental type so we don't have
// to always perform this reconfiguration. Once we set this, the type will
// remain registered on restart, so we will no longer go down this code
@@ -714,6 +715,7 @@ void ProfileSyncService::OnDataTypesChanged(
about_flags::SetExperimentEnabled(g_browser_process->local_state(),
experiment_name,
true);
+#endif // !defined(OS_ANDROID)
}
// Check if the user has "Keep Everything Synced" enabled. If so, we want
@@ -967,7 +969,12 @@ void ProfileSyncService::OnActionableError(const SyncProtocolError& error) {
void ProfileSyncService::ShowErrorUI() {
// TODO(atwilson): Remove this.
+#if defined(OS_ANDROID)
+ // Android uses native UI for sync setup.
+ NOTREACHED();
+#else
LoginUIServiceFactory::GetForProfile(profile_)->ShowLoginUI(false);
+#endif
}
std::string ProfileSyncService::QuerySyncStatusSummary() {
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698