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

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

Issue 1143313006: Add an activity that allows whitelisted applications to clear all data in Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync Created 5 years, 6 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/ChromiumApplication.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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" 345 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
346 android:theme="@style/MainTheme" 346 android:theme="@style/MainTheme"
347 android:label="Chrome.ExpandedControllerActivity" 347 android:label="Chrome.ExpandedControllerActivity"
348 android:hardwareAccelerated="true" 348 android:hardwareAccelerated="true"
349 android:launchMode="singleTask" 349 android:launchMode="singleTask"
350 android:noHistory="true" 350 android:noHistory="true"
351 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 351 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
352 android:excludeFromRecents="true"> 352 android:excludeFromRecents="true">
353 </activity> 353 </activity>
354 354
355 <activity android:name="org.chromium.chrome.browser.childaccounts.ResetD ataActivity"
356 android:theme="@android:style/Theme.Translucent.NoTitleBar"
357 android:exported="true"
358 android:excludeFromRecents="true">
359 </activity>
360
355 <activity android:name="org.chromium.chrome.browser.document.CipherKeyAc tivity" 361 <activity android:name="org.chromium.chrome.browser.document.CipherKeyAc tivity"
356 android:launchMode="singleInstance" 362 android:launchMode="singleInstance"
357 android:theme="@android:style/Theme.Translucent.NoTitleBar" 363 android:theme="@android:style/Theme.Translucent.NoTitleBar"
358 android:excludeFromRecents="true"> 364 android:excludeFromRecents="true">
359 </activity> 365 </activity>
360 366
361 <!-- Providers for chrome data. --> 367 <!-- Providers for chrome data. -->
362 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r" 368 <provider android:name="org.chromium.chrome.browser.ChromeBrowserProvide r"
363 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}" 369 android:authorities="{{ manifest_package }}.ChromeBrowserProvider;{{ manifest_package }}.browser;{{ manifest_package }}"
364 android:exported="true"> 370 android:exported="true">
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 591
586 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R" 592 <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDE R"
587 android:value="org.chromium.content.browser.SmartClipProvider"/> 593 android:value="org.chromium.content.browser.SmartClipProvider"/>
588 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER" 594 <meta-data android:name="org.chromium.components.service_tab_launcher.SE RVICE_TAB_LAUNCHER"
589 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" /> 595 android:value="org.chromium.chrome.browser.ChromeServiceTabLa uncher" />
590 596
591 {% block extra_application_definitions %} 597 {% block extra_application_definitions %}
592 {% endblock %} 598 {% endblock %}
593 </application> 599 </application>
594 </manifest> 600 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698