Android Chromoting: Create new namespace cardboard for all Cardboard desktop activity related classes.

BUG=516871

Review URL: https://codereview.chromium.org/1328543002

Cr-Commit-Position: refs/heads/master@{#346735}

1 files changed, 2 insertions, 1 deletions

diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
index 68219cb..fcc6aee 100644
--- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java
+++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
@@ -19,6 +19,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
+import org.chromium.chromoting.cardboard.DesktopActivity;
 import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.Set;
@@ -204,7 +205,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil
 
         if (id == R.id.actionbar_cardboard) {
             mSwitchToCardboardDesktopActivity = true;
-            Intent intent = new Intent(this, CardboardDesktopActivity.class);
+            Intent intent = new Intent(this, DesktopActivity.class);
             startActivityForResult(intent, Chromoting.CARDBOARD_DESKTOP_ACTIVITY);
             return true;
         }