OLD | NEW |
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; | 5 package org.chromium.chrome.browser; |
6 | 6 |
7 import android.annotation.SuppressLint; | 7 import android.annotation.SuppressLint; |
8 import android.annotation.TargetApi; | 8 import android.annotation.TargetApi; |
9 import android.app.Activity; | 9 import android.app.Activity; |
10 import android.app.ActivityManager; | 10 import android.app.ActivityManager; |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 import org.chromium.base.TraceEvent; | 45 import org.chromium.base.TraceEvent; |
46 import org.chromium.base.VisibleForTesting; | 46 import org.chromium.base.VisibleForTesting; |
47 import org.chromium.base.library_loader.LibraryLoader; | 47 import org.chromium.base.library_loader.LibraryLoader; |
48 import org.chromium.base.metrics.RecordHistogram; | 48 import org.chromium.base.metrics.RecordHistogram; |
49 import org.chromium.base.metrics.RecordUserAction; | 49 import org.chromium.base.metrics.RecordUserAction; |
50 import org.chromium.chrome.R; | 50 import org.chromium.chrome.R; |
51 import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; | 51 import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; |
52 import org.chromium.chrome.browser.IntentHandler.TabOpenType; | 52 import org.chromium.chrome.browser.IntentHandler.TabOpenType; |
53 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; | 53 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; |
54 import org.chromium.chrome.browser.bookmarks.BookmarkUtils; | 54 import org.chromium.chrome.browser.bookmarks.BookmarkUtils; |
55 import org.chromium.chrome.browser.browseractions.BrowserActionsContextMenuItemD
elegate; | 55 import org.chromium.chrome.browser.browseractions.BrowserActionsService; |
56 import org.chromium.chrome.browser.compositor.CompositorViewHolder; | 56 import org.chromium.chrome.browser.compositor.CompositorViewHolder; |
57 import org.chromium.chrome.browser.compositor.layouts.Layout; | 57 import org.chromium.chrome.browser.compositor.layouts.Layout; |
58 import org.chromium.chrome.browser.compositor.layouts.LayoutManager; | 58 import org.chromium.chrome.browser.compositor.layouts.LayoutManager; |
59 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; | 59 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; |
60 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; | 60 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; |
61 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromeTablet; | 61 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromeTablet; |
62 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.Overv
iewModeObserver; | 62 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.Overv
iewModeObserver; |
63 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout; | 63 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout; |
64 import org.chromium.chrome.browser.cookies.CookiesFetcher; | 64 import org.chromium.chrome.browser.cookies.CookiesFetcher; |
65 import org.chromium.chrome.browser.device.DeviceClassManager; | 65 import org.chromium.chrome.browser.device.DeviceClassManager; |
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
636 public void onStart() { | 636 public void onStart() { |
637 super.onStart(); | 637 super.onStart(); |
638 StartupMetrics.getInstance().updateIntent(getIntent()); | 638 StartupMetrics.getInstance().updateIntent(getIntent()); |
639 } | 639 } |
640 | 640 |
641 @Override | 641 @Override |
642 public void onStartWithNative() { | 642 public void onStartWithNative() { |
643 super.onStartWithNative(); | 643 super.onStartWithNative(); |
644 | 644 |
645 setInitialOverviewState(); | 645 setInitialOverviewState(); |
646 BrowserActionsContextMenuItemDelegate.cancelBrowserActionsNotification()
; | 646 BrowserActionsService.cancelBrowserActionsNotification(); |
647 | 647 |
648 resetSavedInstanceState(); | 648 resetSavedInstanceState(); |
649 } | 649 } |
650 | 650 |
651 @Override | 651 @Override |
652 public void onNewIntentWithNative(Intent intent) { | 652 public void onNewIntentWithNative(Intent intent) { |
653 try { | 653 try { |
654 TraceEvent.begin("ChromeTabbedActivity.onNewIntentWithNative"); | 654 TraceEvent.begin("ChromeTabbedActivity.onNewIntentWithNative"); |
655 | 655 |
656 super.onNewIntentWithNative(intent); | 656 super.onNewIntentWithNative(intent); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
696 // Handled. | 696 // Handled. |
697 } | 697 } |
698 } | 698 } |
699 | 699 |
700 private void setInitialOverviewState() { | 700 private void setInitialOverviewState() { |
701 boolean isOverviewVisible = mLayoutManager.overviewVisible(); | 701 boolean isOverviewVisible = mLayoutManager.overviewVisible(); |
702 if (getActivityTab() == null && !isOverviewVisible) { | 702 if (getActivityTab() == null && !isOverviewVisible) { |
703 toggleOverview(); | 703 toggleOverview(); |
704 } | 704 } |
705 | 705 |
706 if (BrowserActionsContextMenuItemDelegate.toggleOverviewByBrowserActions
( | 706 if (BrowserActionsService.shouldToggleOverview(getIntent(), isOverviewVi
sible)) { |
707 getIntent(), isOverviewVisible)) { | |
708 toggleOverview(); | 707 toggleOverview(); |
709 } | 708 } |
710 } | 709 } |
711 | 710 |
712 private void initializeUI() { | 711 private void initializeUI() { |
713 try { | 712 try { |
714 TraceEvent.begin("ChromeTabbedActivity.initializeUI"); | 713 TraceEvent.begin("ChromeTabbedActivity.initializeUI"); |
715 | 714 |
716 CompositorViewHolder compositorViewHolder = getCompositorViewHolder(
); | 715 CompositorViewHolder compositorViewHolder = getCompositorViewHolder(
); |
717 if (DeviceFormFactor.isTablet()) { | 716 if (DeviceFormFactor.isTablet()) { |
(...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2236 } | 2235 } |
2237 }); | 2236 }); |
2238 getAppMenuHandler().setMenuHighlight(R.id.offline_page_id); | 2237 getAppMenuHandler().setMenuHighlight(R.id.offline_page_id); |
2239 int yInsetPx = | 2238 int yInsetPx = |
2240 getResources().getDimensionPixelOffset(R.dimen.text_bubble_menu_
anchor_y_inset); | 2239 getResources().getDimensionPixelOffset(R.dimen.text_bubble_menu_
anchor_y_inset); |
2241 textBubble.setInsetPx(0, FeatureUtilities.isChromeHomeEnabled() ? yInset
Px : 0, 0, | 2240 textBubble.setInsetPx(0, FeatureUtilities.isChromeHomeEnabled() ? yInset
Px : 0, 0, |
2242 FeatureUtilities.isChromeHomeEnabled() ? 0 : yInsetPx); | 2241 FeatureUtilities.isChromeHomeEnabled() ? 0 : yInsetPx); |
2243 textBubble.show(); | 2242 textBubble.show(); |
2244 } | 2243 } |
2245 } | 2244 } |
OLD | NEW |