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

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

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 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/hosted_control_container.xml
diff --git a/chrome/android/java_staging/res/layout/hosted_control_container.xml b/chrome/android/java_staging/res/layout/hosted_control_container.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b45ef334ee65839cfa729a0bc83a3eecb4b5fccd
--- /dev/null
+++ b/chrome/android/java_staging/res/layout/hosted_control_container.xml
@@ -0,0 +1,45 @@
+<?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. -->
+<org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/control_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/hosted_control_container_height" >
+ <view
+ class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
+ android:id="@+id/toolbar_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <include
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/hosted_control_container_height"
+ layout="@layout/hosted_toolbar" />
+ <ImageView
+ android:id="@+id/toolbar_shadow"
+ android:src="@drawable/toolbar_shadow"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/hosted_control_container_height"
+ android:scaleType="fitXY"
+ android:contentDescription="@null" />
+ <ViewStub
+ android:id="@+id/find_toolbar_stub"
+ android:inflatedId="@+id/find_toolbar"
+ android:visibility="gone"
+ android:layout_marginTop="@dimen/tab_strip_height"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/hosted_control_container_height"
+ android:layout="@layout/find_toolbar" />
+ <ViewStub
+ android:id="@+id/find_toolbar_tablet_stub"
+ android:inflatedId="@+id/find_toolbar"
+ android:layout_width="@dimen/find_in_page_popup_width"
+ android:layout_height="@dimen/find_in_page_popup_height"
+ android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"
+ android:layout_gravity="end|top"
+ android:layout="@layout/find_toolbar" />
+ </view>
+</org.chromium.chrome.browser.toolbar.ToolbarControlContainer>
« no previous file with comments | « chrome/android/java_staging/res/layout/find_toolbar.xml ('k') | chrome/android/java_staging/res/layout/hosted_toolbar.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698