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

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 1745563002: Revert of Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 years, 10 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 | chrome/android/java/res/layout/account_signin_view.xml » ('j') | 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 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 android:theme="@style/MainTheme" 255 android:theme="@style/MainTheme"
256 android:autoRemoveFromRecents="true"> 256 android:autoRemoveFromRecents="true">
257 </activity> 257 </activity>
258 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 258 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
259 android:theme="@style/DialogWhenLarge" 259 android:theme="@style/DialogWhenLarge"
260 android:label="@string/fre_label" 260 android:label="@string/fre_label"
261 android:launchMode="singleTop" 261 android:launchMode="singleTop"
262 android:windowSoftInputMode="stateHidden|adjustPan" 262 android:windowSoftInputMode="stateHidden|adjustPan"
263 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 263 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
264 </activity> 264 </activity>
265 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
266 android:theme="@style/MainTheme">
267 </activity>
268 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 265 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
269 android:theme="@style/PreferencesTheme" 266 android:theme="@style/PreferencesTheme"
270 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 267 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
271 android:label="@string/preferences" 268 android:label="@string/preferences"
272 android:exported="false"> 269 android:exported="false">
273 </activity> 270 </activity>
274 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 271 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
275 android:theme="@style/ThemeWithActionBar" 272 android:theme="@style/ThemeWithActionBar"
276 android:hardwareAccelerated="false" 273 android:hardwareAccelerated="false"
277 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 274 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 757 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
761 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 758 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
762 The downstream manifest replaces this block, and hence replaces the list of media route 759 The downstream manifest replaces this block, and hence replaces the list of media route
763 controllers with its own list. --> 760 controllers with its own list. -->
764 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 761 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
765 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 762 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
766 763
767 {% endblock %} 764 {% endblock %}
768 </application> 765 </application>
769 </manifest> 766 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/layout/account_signin_view.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698