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

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

Issue 1641983002: Handle ADDBOOKMARK intent with enhanced bookmarks UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ian's comments Created 4 years, 10 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/enhancedbookmarks/EnhancedBookmarkActivityBase.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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 </activity> 253 </activity>
254 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 254 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
255 android:theme="@style/MainTheme" 255 android:theme="@style/MainTheme"
256 android:autoRemoveFromRecents="true"> 256 android:autoRemoveFromRecents="true">
257 </activity> 257 </activity>
258 <activity android:name="org.chromium.chrome.browser.bookmark.ManageBookm arkActivity" 258 <activity android:name="org.chromium.chrome.browser.bookmark.ManageBookm arkActivity"
259 android:theme="@style/DialogWhenLargeHolo" 259 android:theme="@style/DialogWhenLargeHolo"
260 android:label="@string/save_bookmark" 260 android:label="@string/save_bookmark"
261 android:windowSoftInputMode="stateHidden|adjustPan" 261 android:windowSoftInputMode="stateHidden|adjustPan"
262 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 262 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
263 <intent-filter>
264 <!-- This is sent by the BrowserProviderProxy as a result of
265 calls to android.provider.Browser.saveBookmark(). -->
266 <action android:name="{{ manifest_package }}.ADDBOOKMARK" />
267 <category android:name="android.intent.category.DEFAULT" />
268 </intent-filter>
269 </activity> 263 </activity>
270 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 264 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
271 android:theme="@style/DialogWhenLarge" 265 android:theme="@style/DialogWhenLarge"
272 android:label="@string/fre_label" 266 android:label="@string/fre_label"
273 android:launchMode="singleTop" 267 android:launchMode="singleTop"
274 android:windowSoftInputMode="stateHidden|adjustPan" 268 android:windowSoftInputMode="stateHidden|adjustPan"
275 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 269 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
276 </activity> 270 </activity>
277 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 271 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
278 android:theme="@style/PreferencesTheme" 272 android:theme="@style/PreferencesTheme"
279 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 273 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
280 android:label="@string/preferences" 274 android:label="@string/preferences"
281 android:exported="false"> 275 android:exported="false">
282 </activity> 276 </activity>
283 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 277 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
284 android:theme="@style/ThemeWithActionBar" 278 android:theme="@style/ThemeWithActionBar"
285 android:hardwareAccelerated="false" 279 android:hardwareAccelerated="false"
286 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 280 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
287 </activity> 281 </activity>
288 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" 282 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
289 android:theme="@style/MainTheme" 283 android:theme="@style/MainTheme"
290 android:exported="true"> 284 android:exported="true">
291 </activity> 285 </activity>
292 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity" 286 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity"
293 android:theme="@style/EnhancedBookmarkDialog" 287 android:theme="@style/EnhancedBookmarkDialog"
294 android:windowSoftInputMode="stateAlwaysHidden" 288 android:windowSoftInputMode="stateAlwaysHidden"
295 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > 289 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
296 </activity> 290 </activity>
291 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkAddActivity"
292 android:theme="@style/EnhancedBookmarkDialogWhite"
293 android:windowSoftInputMode="stateHidden"
294 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
295 <intent-filter>
296 <action android:name="{{ manifest_package }}.ADDBOOKMARK" />
297 <category android:name="android.intent.category.DEFAULT" />
298 </intent-filter>
299 </activity>
297 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkEditActivity" 300 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkEditActivity"
298 android:theme="@style/EnhancedBookmarkDialogWhite" 301 android:theme="@style/EnhancedBookmarkDialogWhite"
299 android:windowSoftInputMode="stateHidden" 302 android:windowSoftInputMode="stateHidden"
300 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > 303 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
301 </activity> 304 </activity>
302 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkAddEditFolderActivity" 305 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkAddEditFolderActivity"
303 android:theme="@style/EnhancedBookmarkDialogWhite" 306 android:theme="@style/EnhancedBookmarkDialogWhite"
304 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > 307 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" >
305 </activity> 308 </activity>
306 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkFolderSelectActivity" 309 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkFolderSelectActivity"
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 713 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
711 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 714 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
712 The downstream manifest replaces this block, and hence replaces the list of media route 715 The downstream manifest replaces this block, and hence replaces the list of media route
713 controllers with its own list. --> 716 controllers with its own list. -->
714 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 717 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
715 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 718 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
716 719
717 {% endblock %} 720 {% endblock %}
718 </application> 721 </application>
719 </manifest> 722 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivityBase.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698