summaryrefslogtreecommitdiffstats
path: root/remoting/client/plugin
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 18:12:23 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 18:12:23 +0000
commit150ca3a79a0572e527548430d5849dee2392c9be (patch)
tree59be1ed9ae18ab3bb8a42298ebc67187f5733ef1 /remoting/client/plugin
parent71ee3647e2a1aa84f8a72ff13cfcfa24a2471fe9 (diff)
downloadchromium_src-150ca3a79a0572e527548430d5849dee2392c9be.zip
chromium_src-150ca3a79a0572e527548430d5849dee2392c9be.tar.gz
chromium_src-150ca3a79a0572e527548430d5849dee2392c9be.tar.bz2
Move Chromoting hostlist into tab (from extension popup)
BUG=none TEST=none Review URL: http://codereview.chromium.org/3602002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin')
-rw-r--r--remoting/client/plugin/chromoting_scriptable_object.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/client/plugin/chromoting_scriptable_object.cc b/remoting/client/plugin/chromoting_scriptable_object.cc
index 1bc909b..1fc04e4 100644
--- a/remoting/client/plugin/chromoting_scriptable_object.cc
+++ b/remoting/client/plugin/chromoting_scriptable_object.cc
@@ -30,6 +30,7 @@ void ChromotingScriptableObject::Init() {
// Connection status.
AddAttribute(kStatusAttribute, Var(STATUS_UNKNOWN));
+
// Connection status values.
AddAttribute("STATUS_UNKNOWN", Var(STATUS_UNKNOWN));
AddAttribute("STATUS_CONNECTING", Var(STATUS_CONNECTING));
@@ -40,6 +41,8 @@ void ChromotingScriptableObject::Init() {
// Connection quality.
AddAttribute(kQualityAttribute, Var(QUALITY_UNKNOWN));
+
+ // Connection quality values.
AddAttribute("QUALITY_UNKNOWN", Var(QUALITY_UNKNOWN));
AddAttribute("QUALITY_GOOD", Var(QUALITY_GOOD));
AddAttribute("QUALITY_BAD", Var(QUALITY_BAD));
@@ -64,8 +67,8 @@ bool ChromotingScriptableObject::HasProperty(const Var& name, Var* exception) {
// TODO(ajwong): Investigate why ARM build breaks if you do:
// properties_[iter->second].method == NULL;
- // Somehow the ARM compiler is thinking that the above is using
- // NULL as an arithmetic expression.
+ // Somehow the ARM compiler is thinking that the above is using NULL as an
+ // arithmetic expression.
return properties_[iter->second].method == 0;
}