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

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

Issue 2849533004: Revert of 📺 Move fullscreen web content to a new Activity. (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 android:exported="false" 362 android:exported="false"
363 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" 363 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
364 android:launchMode="singleTask" 364 android:launchMode="singleTask"
365 {{ self.chrome_activity_common() }}> 365 {{ self.chrome_activity_common() }}>
366 </activity> 366 </activity>
367 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 367 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
368 android:theme="@style/TabbedModeTheme" 368 android:theme="@style/TabbedModeTheme"
369 android:exported="false" 369 android:exported="false"
370 {{ self.chrome_activity_common() }}> 370 {{ self.chrome_activity_common() }}>
371 </activity> 371 </activity>
372 <activity android:name="org.chromium.chrome.browser.FullscreenWebContent sActivity"
373 android:theme="@style/MainTheme"
374 android:exported="false"
375 {{ self.chrome_activity_common() }}
376 {{ self.supports_video_persistence() }} >
377 </activity>
378 372
379 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 373 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
380 android:theme="@style/MainTheme" 374 android:theme="@style/MainTheme"
381 android:autoRemoveFromRecents="true"> 375 android:autoRemoveFromRecents="true">
382 </activity> 376 </activity>
383 <activity android:name="org.chromium.chrome.browser.firstrun.Lightweight FirstRunActivity" 377 <activity android:name="org.chromium.chrome.browser.firstrun.Lightweight FirstRunActivity"
384 android:theme="@style/SimpleDialog" 378 android:theme="@style/SimpleDialog"
385 android:launchMode="singleTop" 379 android:launchMode="singleTop"
386 android:autoRemoveFromRecents="true" 380 android:autoRemoveFromRecents="true"
387 android:windowSoftInputMode="stateHidden|adjustPan" 381 android:windowSoftInputMode="stateHidden|adjustPan"
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 955 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
962 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 956 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
963 The downstream manifest replaces this block, and hence replaces the list of media route 957 The downstream manifest replaces this block, and hence replaces the list of media route
964 controllers with its own list. --> 958 controllers with its own list. -->
965 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 959 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
966 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 960 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
967 961
968 {% endblock %} 962 {% endblock %}
969 </application> 963 </application>
970 </manifest> 964 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698