Reenable phone-to-chrome

android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.google.android.apps.chrometophone"
-      android:versionCode="10"
-      android:versionName="2.1.0">
+      android:versionCode="11"
+      android:versionName="2.2.0">
     <!-- Only this application can receive the messages and registration result -->    
     <permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" android:protectionLevel="signature" />
     <uses-permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" />
@@ -33,7 +33,6 @@
                   android:screenOrientation="portrait">
         </activity>
         
-        <!-- TODO: Enable for v2.2
         <activity android:name=".ShareLinkActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -41,7 +40,6 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-        -->
         
         <!-- In order to use the c2dm library, an
              application must declare a class with the name C2DMReceiver, in its 

extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_app_name__",
   "description": "__MSG_app_desc__",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "default_locale": "en",
   "icons": {
     "16": "icon_16.png",

extension/send_logic.js

@@ -57,14 +57,12 @@ function sendToPhone(title, url, msgType, selection, listener) {
   };
 
   var data = 'title=' + encodeURIComponent(title) + '&url=' + encodeURIComponent(url) +
-      '&sel=' + encodeURIComponent(selection) + '&type=' + encodeURIComponent(msgType);
+      '&sel=' + encodeURIComponent(selection) + '&type=' + encodeURIComponent(msgType) +
+      '&deviceType=ac2dm';
   req.send(data);
 }
 
 function initializeBrowserChannel() {
-  // TODO: Enable for v2.2
-  return;
-
   console.log('Initializing browser channel');
 
   var deviceRegistrationId = localStorage['deviceRegistrationId'];