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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/util/get_session_name.cc

Issue 11414013: Depend on stored sync session GUID for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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
« chrome/browser/sync/glue/session_model_associator.cc ('K') | « sync/sync.gyp ('k') | sync/util/session_utils_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/util/get_session_name.cc
diff --git a/sync/util/get_session_name.cc b/sync/util/get_session_name.cc
index 244aa14df8d893b52301ae356b479b67a16f338c..1896ebc0b5fe2e04b2697307ec0585751f683c2d 100644
--- a/sync/util/get_session_name.cc
+++ b/sync/util/get_session_name.cc
@@ -22,7 +22,7 @@
#elif defined(OS_WIN)
#include "sync/util/get_session_name_win.h"
#elif defined(OS_ANDROID)
-#include "sync/util/session_utils_android.h"
+#include "base/android/build_info.h"
#endif
namespace syncer {
@@ -53,7 +53,9 @@ std::string GetSessionNameSynchronously() {
#elif defined(OS_WIN)
session_name = internal::GetComputerName();
#elif defined(OS_ANDROID)
- session_name = internal::GetModel();
+ base::android::BuildInfo* android_build_info =
+ base::android::BuildInfo::GetInstance();
+ session_name = android_build_info->model();
#endif
if (session_name == "Unknown" || session_name.empty())
« chrome/browser/sync/glue/session_model_associator.cc ('K') | « sync/sync.gyp ('k') | sync/util/session_utils_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698