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

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

Issue 1897853002: Remove ResetDataActivity. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/src/org/chromium/chrome/browser/childaccounts/ResetDataActivity.java » ('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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" 418 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
419 android:theme="@style/MainTheme" 419 android:theme="@style/MainTheme"
420 android:label="Chrome.ExpandedControllerActivity" 420 android:label="Chrome.ExpandedControllerActivity"
421 android:hardwareAccelerated="true" 421 android:hardwareAccelerated="true"
422 android:launchMode="singleTask" 422 android:launchMode="singleTask"
423 android:noHistory="true" 423 android:noHistory="true"
424 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 424 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
425 android:excludeFromRecents="true"> 425 android:excludeFromRecents="true">
426 </activity> 426 </activity>
427 427
428 <activity android:name="org.chromium.chrome.browser.childaccounts.ResetD ataActivity"
429 android:theme="@android:style/Theme.Translucent.NoTitleBar"
430 android:exported="true"
431 android:excludeFromRecents="true">
432 </activity>
433
434 <!-- This activity is started along with IncognitoDocumentActivity, so i t also must 428 <!-- This activity is started along with IncognitoDocumentActivity, so i t also must
435 disable hardware acceleration. Besides, it doesn't have any UI. --> 429 disable hardware acceleration. Besides, it doesn't have any UI. -->
436 <activity android:name="org.chromium.chrome.browser.document.CipherKeyAc tivity" 430 <activity android:name="org.chromium.chrome.browser.document.CipherKeyAc tivity"
437 android:launchMode="singleInstance" 431 android:launchMode="singleInstance"
438 android:theme="@android:style/Theme.Translucent.NoTitleBar" 432 android:theme="@android:style/Theme.Translucent.NoTitleBar"
439 android:excludeFromRecents="true" 433 android:excludeFromRecents="true"
440 android:hardwareAccelerated="false"> 434 android:hardwareAccelerated="false">
441 </activity> 435 </activity>
442 436
443 <!-- This activity is used to restart the main Chrome process. Should n ever be exported. --> 437 <!-- This activity is used to restart the main Chrome process. Should n ever be exported. -->
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 805 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
812 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 806 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
813 The downstream manifest replaces this block, and hence replaces the list of media route 807 The downstream manifest replaces this block, and hence replaces the list of media route
814 controllers with its own list. --> 808 controllers with its own list. -->
815 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 809 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
816 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 810 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
817 811
818 {% endblock %} 812 {% endblock %}
819 </application> 813 </application>
820 </manifest> 814 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ResetDataActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698