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

Unified Diff: chrome/android/java_staging/res/layout/main.xml

Issue 1178323005: Move remaining resources from java_staging/res to java/res. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@res_default
Patch Set: renamed conflicting resource in chrome shell Created 5 years, 6 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: chrome/android/java_staging/res/layout/main.xml
diff --git a/chrome/android/java_staging/res/layout/main.xml b/chrome/android/java_staging/res/layout/main.xml
deleted file mode 100644
index 5d693704bc03c11b074164130f84c110fbb8d1f3..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/res/layout/main.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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. -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <org.chromium.chrome.browser.compositor.CompositorViewHolder
- android:id="@+id/compositor_view_holder"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <FrameLayout
- android:id="@+id/keyboard_accessory"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone" />
- </LinearLayout>
-
- <ViewStub
- android:id="@+id/omnibox_results_container_stub"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="@dimen/tab_strip_height"
- android:inflatedId="@+id/omnibox_results_container"
- android:layout="@layout/omnibox_results_container" />
-
- <!-- Toolbar size area painted black to avoid the action bar showing the window background -->
- <View
- android:id="@+id/action_bar_black_background"
- android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height_no_shadow"
- android:background="#000000"
- android:visibility="gone" />
- <ViewStub
- android:id="@+id/control_container_stub"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- <ViewStub
- android:id="@+id/empty_container_stub"
- android:inflatedId="@+id/empty_container"
- android:layout="@layout/empty_background_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
- <!-- This empty view is used as the anchor for custom menu -->
- <View
- android:id="@+id/menu_anchor_stub"
- android:layout_width="0px"
- android:layout_height="0px"
- android:layout_gravity="bottom|start"
- />
-</merge>
« no previous file with comments | « chrome/android/java_staging/res/layout/location_bar.xml ('k') | chrome/android/java_staging/res/layout/most_visited_item.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698