summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnme@chromium.org <johnme@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 15:05:04 +0000
committerjohnme@chromium.org <johnme@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 15:05:04 +0000
commit4649b3757c24b2d98d3aa88e2b06829ddd0ddadf (patch)
tree1875ee4b6a9888e026d646de2dcffa964ed15233
parent03f39972dbef1ae059ccee353afbf9c6cf7c3ea5 (diff)
downloadchromium_src-4649b3757c24b2d98d3aa88e2b06829ddd0ddadf.zip
chromium_src-4649b3757c24b2d98d3aa88e2b06829ddd0ddadf.tar.gz
chromium_src-4649b3757c24b2d98d3aa88e2b06829ddd0ddadf.tar.bz2
Fix session_model_associator.cc compile on Android.
crrev.com/143449 (crbug.com/128060) moved sync/util/session_utils_android.h into the csync namespace, but didn't update the reference to internal::IsTabletUi in chrome/browser/sync/glue/session_model_associator.cc. This fixes that. TBR=yfriedman@chromium.org BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10667035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144173 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/glue/session_model_associator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index a6146d0..4be9d05 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -80,7 +80,7 @@ sync_pb::SessionHeader::DeviceType GetLocalDeviceType() {
#elif defined(OS_WIN)
return sync_pb::SessionHeader_DeviceType_TYPE_WIN;
#elif defined(OS_ANDROID)
- return internal::IsTabletUi() ?
+ return csync::internal::IsTabletUi() ?
sync_pb::SessionHeader_DeviceType_TYPE_TABLET :
sync_pb::SessionHeader_DeviceType_TYPE_PHONE;
#else