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

Side by Side Diff: chrome/android/java/res/layout/custom_tabs_toolbar.xml

Issue 1320493003: [Custom Tabs]Fix a bug that https is not shown properly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar 6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" > 8 xmlns:chrome="http://schemas.android.com/apk/res-auto" >
9 <ImageButton 9 <ImageButton
10 android:id="@+id/close_button" 10 android:id="@+id/close_button"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 android:paddingEnd="@dimen/toolbar_edge_padding" 44 android:paddingEnd="@dimen/toolbar_edge_padding"
45 android:textSize="@dimen/custom_tabs_title_text_size" 45 android:textSize="@dimen/custom_tabs_title_text_size"
46 android:visibility="gone" /> 46 android:visibility="gone" />
47 <org.chromium.chrome.browser.omnibox.UrlBar 47 <org.chromium.chrome.browser.omnibox.UrlBar
48 android:id="@+id/url_bar" 48 android:id="@+id/url_bar"
49 android:layout_width="wrap_content" 49 android:layout_width="wrap_content"
50 android:layout_height="wrap_content" 50 android:layout_height="wrap_content"
51 android:layout_gravity="bottom" 51 android:layout_gravity="bottom"
52 android:background="@null" 52 android:background="@null"
53 android:inputType="none" 53 android:inputType="none"
54 android:maxLines="1" 54 android:singleLine="true"
55 android:paddingEnd="@dimen/toolbar_edge_padding" 55 android:paddingEnd="@dimen/toolbar_edge_padding"
56 android:textSize="@dimen/location_bar_url_text_size" /> 56 android:textSize="@dimen/location_bar_url_text_size" />
57 </FrameLayout> 57 </FrameLayout>
58 </FrameLayout> 58 </FrameLayout>
59 <ImageButton 59 <ImageButton
60 android:id="@+id/action_button" 60 android:id="@+id/action_button"
61 style="@style/ToolbarButton" 61 style="@style/ToolbarButton"
62 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
63 android:maxWidth="@dimen/custom_tabs_toolbar_maxWidth" 63 android:maxWidth="@dimen/custom_tabs_toolbar_maxWidth"
64 android:paddingTop="@dimen/custom_tabs_toolbar_vertical_padding" 64 android:paddingTop="@dimen/custom_tabs_toolbar_vertical_padding"
(...skipping 13 matching lines...) Expand all
78 android:src="@drawable/btn_menu" 78 android:src="@drawable/btn_menu"
79 android:contentDescription="@string/accessibility_toolbar_btn_menu" 79 android:contentDescription="@string/accessibility_toolbar_btn_menu"
80 android:background="@null" /> 80 android:background="@null" />
81 <org.chromium.chrome.browser.widget.ToolbarProgressBar 81 <org.chromium.chrome.browser.widget.ToolbarProgressBar
82 android:id="@+id/progress" 82 android:id="@+id/progress"
83 android:layout_width="match_parent" 83 android:layout_width="match_parent"
84 android:layout_height="2dp" 84 android:layout_height="2dp"
85 chrome:progressBarColor="@color/progress_bar_foreground" 85 chrome:progressBarColor="@color/progress_bar_foreground"
86 chrome:backgroundColor="@color/progress_bar_background" /> 86 chrome:backgroundColor="@color/progress_bar_background" />
87 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> 87 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698