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

Unified Diff: chromecast/shell/android/apk/res/layout/cast_shell_activity.xml

Issue 490603002: Chromecast: initial checkin of Android-based cast shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added android DEPS (git cl presubmit doesn't check Java DEPS?) Created 6 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
Index: chromecast/shell/android/apk/res/layout/cast_shell_activity.xml
diff --git a/content/shell/android/shell_apk/res/layout/content_shell_activity.xml b/chromecast/shell/android/apk/res/layout/cast_shell_activity.xml
similarity index 75%
copy from content/shell/android/shell_apk/res/layout/content_shell_activity.xml
copy to chromecast/shell/android/apk/res/layout/cast_shell_activity.xml
index c62e66ec5dc4c82b36ee5bece9d72661b013a6bd..428b1a512a6e70f697e1baceb6b50d6cb14d7d7b 100644
--- a/content/shell/android/shell_apk/res/layout/content_shell_activity.xml
+++ b/chromecast/shell/android/apk/res/layout/cast_shell_activity.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
-
+<!-- Copyright 2014 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <org.chromium.content_shell.ShellManager
+ <org.chromium.chromecast.shell.CastWindowManager
android:id="@+id/shell_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
« no previous file with comments | « chromecast/shell/android/apk/AndroidManifest.xml ('k') | chromecast/shell/android/apk/res/layout/cast_window_view.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698