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

Unified Diff: chrome/android/java_staging/res/layout/hosted_toolbar.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_toolbar.xml
diff --git a/chrome/android/java_staging/res/layout/hosted_toolbar.xml b/chrome/android/java_staging/res/layout/hosted_toolbar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb7f908f156684e623a78201d8e8e2596c818c6f
--- /dev/null
+++ b/chrome/android/java_staging/res/layout/hosted_toolbar.xml
@@ -0,0 +1,54 @@
+<?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.HostedToolbar xmlns:android="http://schemas.android.com/apk/res/android">
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/back_button"
+ style="@style/ToolbarButton"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/btn_chevron_left" />
+ <ImageButton android:id="@+id/security_button"
+ style="@style/LocationBarButton"
+ android:layout_width="@dimen/location_bar_icon_width"
+ android:layout_height="match_parent"
+ android:layout_marginStart="48dp"
+ android:scaleType="center"
+ android:layout_gravity="center_vertical"
+ android:alpha="0"
+ android:visibility="gone"
+ android:contentDescription="@string/accessibility_toolbar_btn_security_lock" />
+ <include
+ android:id="@+id/url_container"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginTop="3dp"
+ android:layout_marginBottom="3dp"
+ android:layout_gravity="center_vertical"
+ layout="@layout/url_container"
+ />
+ <ImageButton
+ android:id="@+id/action_button"
+ style="@style/ToolbarButton"
+ android:layout_marginEnd="42dp"
+ android:layout_gravity="center_vertical|end"
+ android:visibility="gone"
+ android:contentDescription="@string/accessibility_toolbar_btn_custom" />
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/menu_button"
+ style="@style/ToolbarButton"
+ android:layout_gravity="center_vertical|end"
+ android:layout_width="42dp"
+ android:paddingEnd="4dp"
+ android:src="@drawable/btn_menu"
+ android:contentDescription="@string/accessibility_toolbar_btn_menu"
+ android:background="@null" />
+ <org.chromium.chrome.browser.widget.ToolbarProgressBar
+ android:id="@+id/progress"
+ style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+ android:progressDrawable="@drawable/progress_bar"
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:progress="0" />
+</org.chromium.chrome.browser.toolbar.HostedToolbar>

Powered by Google App Engine
This is Rietveld 408576698