Chromium Code Reviews| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 import org.chromium.base.TraceEvent; | 44 import org.chromium.base.TraceEvent; |
| 45 import org.chromium.base.VisibleForTesting; | 45 import org.chromium.base.VisibleForTesting; |
| 46 import org.chromium.base.library_loader.LibraryLoader; | 46 import org.chromium.base.library_loader.LibraryLoader; |
| 47 import org.chromium.base.metrics.RecordHistogram; | 47 import org.chromium.base.metrics.RecordHistogram; |
| 48 import org.chromium.base.metrics.RecordUserAction; | 48 import org.chromium.base.metrics.RecordUserAction; |
| 49 import org.chromium.chrome.R; | 49 import org.chromium.chrome.R; |
| 50 import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; | 50 import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; |
| 51 import org.chromium.chrome.browser.IntentHandler.TabOpenType; | 51 import org.chromium.chrome.browser.IntentHandler.TabOpenType; |
| 52 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; | 52 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; |
| 53 import org.chromium.chrome.browser.bookmarks.BookmarkUtils; | 53 import org.chromium.chrome.browser.bookmarks.BookmarkUtils; |
| 54 import org.chromium.chrome.browser.browseractions.BrowserActionsContextMenuItemD elegate; | 54 import org.chromium.chrome.browser.browseractions.BrowserActionsTabCreationServi ce; |
| 55 import org.chromium.chrome.browser.compositor.CompositorViewHolder; | 55 import org.chromium.chrome.browser.compositor.CompositorViewHolder; |
| 56 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChange Reason; | 56 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChange Reason; |
| 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; |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 615 public void onStart() { | 615 public void onStart() { |
| 616 super.onStart(); | 616 super.onStart(); |
| 617 StartupMetrics.getInstance().updateIntent(getIntent()); | 617 StartupMetrics.getInstance().updateIntent(getIntent()); |
| 618 } | 618 } |
| 619 | 619 |
| 620 @Override | 620 @Override |
| 621 public void onStartWithNative() { | 621 public void onStartWithNative() { |
| 622 super.onStartWithNative(); | 622 super.onStartWithNative(); |
| 623 | 623 |
| 624 setInitialOverviewState(); | 624 setInitialOverviewState(); |
| 625 BrowserActionsContextMenuItemDelegate.cancelBrowserActionsNotification() ; | 625 BrowserActionsTabCreationService.cancelBrowserActionsNotification(); |
| 626 | 626 |
| 627 resetSavedInstanceState(); | 627 resetSavedInstanceState(); |
| 628 } | 628 } |
| 629 | 629 |
| 630 @Override | 630 @Override |
| 631 public void onNewIntentWithNative(Intent intent) { | 631 public void onNewIntentWithNative(Intent intent) { |
| 632 try { | 632 try { |
| 633 TraceEvent.begin("ChromeTabbedActivity.onNewIntentWithNative"); | 633 TraceEvent.begin("ChromeTabbedActivity.onNewIntentWithNative"); |
| 634 | 634 |
| 635 super.onNewIntentWithNative(intent); | 635 super.onNewIntentWithNative(intent); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 675 // Handled. | 675 // Handled. |
| 676 } | 676 } |
| 677 } | 677 } |
| 678 | 678 |
| 679 private void setInitialOverviewState() { | 679 private void setInitialOverviewState() { |
| 680 boolean isOverviewVisible = mLayoutManager.overviewVisible(); | 680 boolean isOverviewVisible = mLayoutManager.overviewVisible(); |
| 681 if (getActivityTab() == null && !isOverviewVisible) { | 681 if (getActivityTab() == null && !isOverviewVisible) { |
| 682 toggleOverview(); | 682 toggleOverview(); |
| 683 } | 683 } |
| 684 | 684 |
| 685 if (BrowserActionsContextMenuItemDelegate.toggleOverviewByBrowserActions ( | 685 if (BrowserActionsTabCreationService.toggleOverviewByBrowserActions( |
|
Yusuf
2017/07/18 22:59:47
can we rename this to shouldToggleOverview()?
ltian
2017/08/07 23:24:11
Done.
| |
| 686 getIntent(), isOverviewVisible)) { | 686 getIntent(), isOverviewVisible)) { |
| 687 toggleOverview(); | 687 toggleOverview(); |
| 688 } | 688 } |
| 689 } | 689 } |
| 690 | 690 |
| 691 private void initializeUI() { | 691 private void initializeUI() { |
| 692 try { | 692 try { |
| 693 TraceEvent.begin("ChromeTabbedActivity.initializeUI"); | 693 TraceEvent.begin("ChromeTabbedActivity.initializeUI"); |
| 694 | 694 |
| 695 CompositorViewHolder compositorViewHolder = getCompositorViewHolder( ); | 695 CompositorViewHolder compositorViewHolder = getCompositorViewHolder( ); |
| (...skipping 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2191 if (info.id == sMergedInstanceTaskId) return true; | 2191 if (info.id == sMergedInstanceTaskId) return true; |
| 2192 } | 2192 } |
| 2193 return false; | 2193 return false; |
| 2194 } | 2194 } |
| 2195 | 2195 |
| 2196 @Override | 2196 @Override |
| 2197 public boolean supportsFullscreenActivity() { | 2197 public boolean supportsFullscreenActivity() { |
| 2198 return !VrShellDelegate.isInVr(); | 2198 return !VrShellDelegate.isInVr(); |
| 2199 } | 2199 } |
| 2200 } | 2200 } |
| OLD | NEW |