OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. |
4 | |
5 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
6 found in the LICENSE file. | 5 found in the LICENSE file. |
7 --> | 6 --> |
8 | 7 |
9 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 8 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
10 <org.chromium.content_shell.ShellManager | 9 <org.chromium.chromecast.shell.CastWindowManager |
11 android:id="@+id/shell_container" | 10 android:id="@+id/shell_container" |
12 android:layout_width="match_parent" | 11 android:layout_width="match_parent" |
13 android:layout_height="match_parent" /> | 12 android:layout_height="match_parent" /> |
14 </merge> | 13 </merge> |
OLD | NEW |