sync/util/get_session_name.cc - Issue 11414013: Depend on stored sync session GUID for Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Simplified implementation Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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())

« no previous file with comments | « sync/sync.gyp ('k') | sync/util/session_utils_android.h » ('j') | no next file with comments »