summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 01:46:48 +0000
committertedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 01:46:48 +0000
commit694dfbdfa316d2c15c167ddf075eaff5efdae276 (patch)
treef6ae77bb6c77980f43881baee1bf22f8361a2aac
parent109d41a90286012cbb63b414eac8eb278270fed5 (diff)
downloadchromium_src-694dfbdfa316d2c15c167ddf075eaff5efdae276.zip
chromium_src-694dfbdfa316d2c15c167ddf075eaff5efdae276.tar.gz
chromium_src-694dfbdfa316d2c15c167ddf075eaff5efdae276.tar.bz2
Fix device type icons for "other devices" tab on Android.
This value used to be defined on the window object, but has since moved to the "client". BUG=163004 Review URL: https://chromiumcodereview.appspot.com/11348336 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170860 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/ntp_android/ntp_android.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/resources/ntp_android/ntp_android.js b/chrome/browser/resources/ntp_android/ntp_android.js
index beada23..8d1126b 100644
--- a/chrome/browser/resources/ntp_android/ntp_android.js
+++ b/chrome/browser/resources/ntp_android/ntp_android.js
@@ -1743,19 +1743,19 @@ cr.define('ntp', function() {
clientName = client.name;
var iconStyle;
- if (windows[0].deviceType == 'win' ||
- windows[0].deviceType == 'macosx' ||
- windows[0].deviceType == 'linux' ||
- windows[0].deviceType == 'chromeos' ||
- windows[0].deviceType == 'other') {
+ var deviceType = client.deviceType;
+ if (deviceType == 'win' ||
+ deviceType == 'macosx' ||
+ deviceType == 'linux' ||
+ deviceType == 'chromeos' ||
+ deviceType == 'other') {
iconStyle = 'laptop';
- } else if (windows[0].deviceType == 'phone') {
+ } else if (deviceType == 'phone') {
iconStyle = 'phone';
- } else if (windows[0].deviceType == 'tablet') {
+ } else if (deviceType == 'tablet') {
iconStyle = 'tablet';
} else {
- console.error(
- 'Unknown sync device type found: ', windows[0].deviceType);
+ console.error('Unknown sync device type found: ', deviceType);
iconStyle = 'laptop';
}
var headerList = [{