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

Side by Side Diff: chrome/browser/sync/sync_setup_flow.cc

Issue 3165046: sync: disable the mistakenly enabled sessions code. (Closed)
Patch Set: rebase Created 10 years, 4 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 | « chrome/browser/sync/profile_sync_factory_impl_unittest.cc ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/sync/sync_setup_flow.h" 5 #include "chrome/browser/sync/sync_setup_flow.h"
6 6
7 #include "app/gfx/font_util.h" 7 #include "app/gfx/font_util.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/histogram.h" 9 #include "base/histogram.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 return false; 99 return false;
100 if (sync_autofill) 100 if (sync_autofill)
101 data_types->insert(syncable::AUTOFILL); 101 data_types->insert(syncable::AUTOFILL);
102 102
103 bool sync_extensions; 103 bool sync_extensions;
104 if (!result->GetBoolean("syncExtensions", &sync_extensions)) 104 if (!result->GetBoolean("syncExtensions", &sync_extensions))
105 return false; 105 return false;
106 if (sync_extensions) 106 if (sync_extensions)
107 data_types->insert(syncable::EXTENSIONS); 107 data_types->insert(syncable::EXTENSIONS);
108 108
109 bool sync_sessions;
110 if (!result->GetBoolean("syncSessions", &sync_sessions))
111 return false;
112 if (sync_sessions)
113 data_types->insert(syncable::SESSIONS);
114
115 bool sync_typed_urls; 109 bool sync_typed_urls;
116 if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls)) 110 if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
117 return false; 111 return false;
118 if (sync_typed_urls) 112 if (sync_typed_urls)
119 data_types->insert(syncable::TYPED_URLS); 113 data_types->insert(syncable::TYPED_URLS);
120 114
121 bool sync_apps; 115 bool sync_apps;
122 if (!result->GetBoolean("syncApps", &sync_apps)) 116 if (!result->GetBoolean("syncApps", &sync_apps))
123 return false; 117 return false;
124 if (sync_apps) 118 if (sync_apps)
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 Browser* b = BrowserList::GetLastActive(); 508 Browser* b = BrowserList::GetLastActive();
515 if (b) { 509 if (b) {
516 b->BrowserShowHtmlDialog(flow, parent_window); 510 b->BrowserShowHtmlDialog(flow, parent_window);
517 } else { 511 } else {
518 delete flow; 512 delete flow;
519 return NULL; 513 return NULL;
520 } 514 }
521 #endif // defined(OS_MACOSX) 515 #endif // defined(OS_MACOSX)
522 return flow; 516 return flow;
523 } 517 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698