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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java

Issue 1440623004: [Enhanced Bookmark]Rewrite initialization logic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added another class: EBUIState. All EB will be remaned to B this month. Created 5 years 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.enhancedbookmarks; 5 package org.chromium.chrome.browser.enhancedbookmarks;
6 6
7 import android.content.Intent; 7 import android.content.Intent;
8 import android.os.Bundle; 8 import android.os.Bundle;
9 import android.text.TextUtils;
9 import android.view.WindowManager; 10 import android.view.WindowManager;
10 11
11 import org.chromium.chrome.R; 12 import org.chromium.chrome.R;
13 import org.chromium.chrome.browser.UrlConstants;
12 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge; 14 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
13 import org.chromium.chrome.browser.snackbar.SnackbarManager; 15 import org.chromium.chrome.browser.snackbar.SnackbarManager;
14 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable; 16 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
15 import org.chromium.components.bookmarks.BookmarkId; 17 import org.chromium.components.bookmarks.BookmarkId;
16 18
17 /** 19 /**
18 * The activity that wraps all enhanced bookmark UI on the phone. It keeps a 20 * The activity that wraps all enhanced bookmark UI on the phone. It keeps a
19 * {@link EnhancedBookmarkManager} inside of it and creates a snackbar manager. This activity 21 * {@link EnhancedBookmarkManager} inside of it and creates a snackbar manager. This activity
20 * should only be shown on phones; on tablet the enhanced bookmark UI is shown i nside of a tab (see 22 * should only be shown on phones; on tablet the enhanced bookmark UI is shown i nside of a tab (see
21 * {@link EnhancedBookmarkPage}). 23 * {@link EnhancedBookmarkPage}).
22 */ 24 */
23 public class EnhancedBookmarkActivity extends EnhancedBookmarkActivityBase imple ments 25 public class EnhancedBookmarkActivity extends EnhancedBookmarkActivityBase imple ments
24 SnackbarManageable { 26 SnackbarManageable {
25 27
26 private EnhancedBookmarkManager mBookmarkManager; 28 private EnhancedBookmarkManager mBookmarkManager;
27 private SnackbarManager mSnackbarManager; 29 private SnackbarManager mSnackbarManager;
28 static final int EDIT_BOOKMARK_REQUEST_CODE = 14; 30 static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
29 public static final String INTENT_VISIT_BOOKMARK_ID = 31 public static final String INTENT_VISIT_BOOKMARK_ID =
30 "EnhancedBookmarkEditActivity.VisitBookmarkId"; 32 "EnhancedBookmarkEditActivity.VisitBookmarkId";
31 33
32 @Override 34 @Override
33 protected void onCreate(Bundle savedInstanceState) { 35 protected void onCreate(Bundle savedInstanceState) {
34 super.onCreate(savedInstanceState); 36 super.onCreate(savedInstanceState);
35 getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_ BACKGROUNDS); 37 getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_ BACKGROUNDS);
36 mSnackbarManager = new SnackbarManager(this); 38 mSnackbarManager = new SnackbarManager(this);
37 mBookmarkManager = new EnhancedBookmarkManager(this); 39 mBookmarkManager = new EnhancedBookmarkManager(this);
40 String url = getIntent().getDataString();
41 if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;
42 mBookmarkManager.updateForUrl(url);
43
38 setContentView(mBookmarkManager.getView()); 44 setContentView(mBookmarkManager.getView());
39 EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(this, getString( 45 EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(this, getString(
40 OfflinePageBridge.isEnabled() ? R.string.offline_pages_saved_pag es 46 OfflinePageBridge.isEnabled() ? R.string.offline_pages_saved_pag es
41 : R.string.bookmarks)); 47 : R.string.bookmarks));
42 48
43 // Hack to work around inferred theme false lint error: http://crbug.com /445633 49 // Hack to work around inferred theme false lint error: http://crbug.com /445633
44 assert (R.layout.eb_main_content != 0); 50 assert (R.layout.eb_main_content != 0);
45 } 51 }
46 52
47 @Override 53 @Override
(...skipping 21 matching lines...) Expand all
69 @Override 75 @Override
70 protected void onActivityResult(int requestCode, int resultCode, Intent data ) { 76 protected void onActivityResult(int requestCode, int resultCode, Intent data ) {
71 super.onActivityResult(requestCode, resultCode, data); 77 super.onActivityResult(requestCode, resultCode, data);
72 if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK ) { 78 if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK ) {
73 BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getS tringExtra( 79 BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getS tringExtra(
74 INTENT_VISIT_BOOKMARK_ID)); 80 INTENT_VISIT_BOOKMARK_ID));
75 mBookmarkManager.openBookmark(bookmarkId, LaunchLocation.BOOKMARK_ED ITOR); 81 mBookmarkManager.openBookmark(bookmarkId, LaunchLocation.BOOKMARK_ED ITOR);
76 } 82 }
77 } 83 }
78 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698