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

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

Issue 1025403002: [Sync] PassphraseActivity: unregister for sync events when paused. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ChromeActivityTestBase and rename FakeProfileSyncService. Created 5 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 | « chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java ('k') | 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 2
3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
4 4
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 8
9 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 9 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
10 package="org.chromium.chrome.shell"> 10 package="org.chromium.chrome.shell">
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 <action android:name="android.intent.action.VIEW" /> 58 <action android:name="android.intent.action.VIEW" />
59 <category android:name="android.intent.category.DEFAULT" /> 59 <category android:name="android.intent.category.DEFAULT" />
60 </intent-filter> 60 </intent-filter>
61 </activity> 61 </activity>
62 <activity android:theme="@style/PreferencesTheme" 62 <activity android:theme="@style/PreferencesTheme"
63 android:name="org.chromium.chrome.shell.preferences.ChromeShellP references" 63 android:name="org.chromium.chrome.shell.preferences.ChromeShellP references"
64 android:configChanges="orientation|keyboardHidden|keyboard|scree nSize" 64 android:configChanges="orientation|keyboardHidden|keyboard|scree nSize"
65 android:label="@string/preferences" 65 android:label="@string/preferences"
66 android:exported="false"> 66 android:exported="false">
67 </activity> 67 </activity>
68 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
69 android:theme="@style/PreferencesTheme">
70 </activity>
68 71
69 <!-- The following service entries exist in order to allow us to 72 <!-- The following service entries exist in order to allow us to
70 start more than one sandboxed process. --> 73 start more than one sandboxed process. -->
71 74
72 <!-- NOTE: If you change the value of "android:process" for the below se rvices, 75 <!-- NOTE: If you change the value of "android:process" for the below se rvices,
73 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. --> 76 you also need to update kHelperProcessExecutableName in chrome_cons tants.cc. -->
74 {% set num_sandboxed_services = 20 %} 77 {% set num_sandboxed_services = 20 %}
75 <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERV ICES" 78 <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERV ICES"
76 android:value="{{ num_sandboxed_services }}"/> 79 android:value="{{ num_sandboxed_services }}"/>
77 {% for i in range(num_sandboxed_services) %} 80 {% for i in range(num_sandboxed_services) %}
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 <!-- Media route controllers to use for remote playback (cast). 224 <!-- Media route controllers to use for remote playback (cast).
222 This is here, rather than in code, since it varies between upstream and downstream, 225 This is here, rather than in code, since it varies between upstream and downstream,
223 yet we need this list of classes in the notification service, which belongs upstream 226 yet we need this list of classes in the notification service, which belongs upstream
224 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element, 227 and doesn't run the downstream Clank startup code. The Cast code wi ll, for each media element,
225 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 228 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
226 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones --> 229 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones -->
227 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 230 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
228 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 231 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
229 </application> 232 </application>
230 </manifest> 233 </manifest>
OLDNEW
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698