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.TargetApi; | 7 import android.annotation.TargetApi; |
8 import android.app.Activity; | 8 import android.app.Activity; |
9 import android.app.ActivityManager; | 9 import android.app.ActivityManager; |
10 import android.content.Context; | 10 import android.content.Context; |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 } | 234 } |
235 } | 235 } |
236 | 236 |
237 @Override | 237 @Override |
238 public void initializeCompositor() { | 238 public void initializeCompositor() { |
239 try { | 239 try { |
240 TraceEvent.begin("ChromeTabbedActivity.initializeCompositor"); | 240 TraceEvent.begin("ChromeTabbedActivity.initializeCompositor"); |
241 super.initializeCompositor(); | 241 super.initializeCompositor(); |
242 | 242 |
243 mTabModelSelectorImpl.onNativeLibraryReady(getTabContentManager()); | 243 mTabModelSelectorImpl.onNativeLibraryReady(getTabContentManager()); |
| 244 mVrShellDelegate.onNativeLibraryReady(); |
244 | 245 |
245 mTabModelObserver = new EmptyTabModelObserver() { | 246 mTabModelObserver = new EmptyTabModelObserver() { |
246 @Override | 247 @Override |
247 public void didCloseTab(int tabId, boolean incognito) { | 248 public void didCloseTab(int tabId, boolean incognito) { |
248 closeIfNoTabsAndHomepageEnabled(false); | 249 closeIfNoTabsAndHomepageEnabled(false); |
249 } | 250 } |
250 | 251 |
251 @Override | 252 @Override |
252 public void tabPendingClosure(Tab tab) { | 253 public void tabPendingClosure(Tab tab) { |
253 closeIfNoTabsAndHomepageEnabled(true); | 254 closeIfNoTabsAndHomepageEnabled(true); |
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1596 } | 1597 } |
1597 | 1598 |
1598 /** | 1599 /** |
1599 * See VrShellDelegate#isVrShellEnabled() | 1600 * See VrShellDelegate#isVrShellEnabled() |
1600 */ | 1601 */ |
1601 @Override | 1602 @Override |
1602 public boolean isVrShellEnabled() { | 1603 public boolean isVrShellEnabled() { |
1603 return mVrShellDelegate.isVrShellEnabled(); | 1604 return mVrShellDelegate.isVrShellEnabled(); |
1604 } | 1605 } |
1605 } | 1606 } |
OLD | NEW |