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

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

Issue 2851433002: 📺 Add supports_video_persistence back to ChromeTabbedActivity2. (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 | 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 <!-- 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode" 355 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
356 android:hardwareAccelerated="false" 356 android:hardwareAccelerated="false"
357 {% endblock %} 357 {% endblock %}
358 > 358 >
359 </activity> 359 </activity>
360 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2" 360 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2"
361 android:theme="@style/TabbedModeTheme" 361 android:theme="@style/TabbedModeTheme"
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 {{ self.supports_video_persistence() }}>
366 </activity> 367 </activity>
367 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 368 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
368 android:theme="@style/TabbedModeTheme" 369 android:theme="@style/TabbedModeTheme"
369 android:exported="false" 370 android:exported="false"
370 {{ self.chrome_activity_common() }}> 371 {{ self.chrome_activity_common() }}>
371 </activity> 372 </activity>
372 373
373 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 374 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
374 android:theme="@style/MainTheme" 375 android:theme="@style/MainTheme"
375 android:autoRemoveFromRecents="true"> 376 android:autoRemoveFromRecents="true">
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 954 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
954 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 955 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
955 The downstream manifest replaces this block, and hence replaces the list of media route 956 The downstream manifest replaces this block, and hence replaces the list of media route
956 controllers with its own list. --> 957 controllers with its own list. -->
957 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 958 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
958 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 959 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
959 960
960 {% endblock %} 961 {% endblock %}
961 </application> 962 </application>
962 </manifest> 963 </manifest>
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