Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(947)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: blimp/client/android/java/res/layout/blimp_main.xml

Issue 1295243003: Initial commit of the blimp/ folder and target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address final nits. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« blimp/client/android/blimp_view.h ('K') | « blimp/client/android/blimp_view.cc ('k') | blimp/client/android/java/src/org/chromium/blimp/BlimpApplication.java » ('j') | blimp/client/compositor/blimp_compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/android/java/res/layout/blimp_main.xml
diff --git a/remoting/android/java/res/layout/cardboard_desktop.xml b/blimp/client/android/java/res/layout/blimp_main.xml
similarity index 71%
copy from remoting/android/java/res/layout/cardboard_desktop.xml
copy to blimp/client/android/java/res/layout/blimp_main.xml
index def62d7abe0d037b09ea04a44a52b3162df34910..bf5083cce195422be6ed1e2f5fd03a8d61b09d88 100644
--- a/remoting/android/java/res/layout/cardboard_desktop.xml
+++ b/blimp/client/android/java/res/layout/blimp_main.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
--->
+ found in the LICENSE file. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <com.google.vrtoolkit.cardboard.CardboardView
- android:id="@+id/cardboard_view"
+ <org.chromium.blimp.BlimpView
+ android:id="@+id/renderer"
android:layout_width="match_parent"
android:layout_height="match_parent" />
-</merge>
+</merge>
« blimp/client/android/blimp_view.h ('K') | « blimp/client/android/blimp_view.cc ('k') | blimp/client/android/java/src/org/chromium/blimp/BlimpApplication.java » ('j') | blimp/client/compositor/blimp_compositor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698