| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.shell; | 5 package org.chromium.chrome.shell; |
| 6 | 6 |
| 7 import android.app.Activity; | 7 import android.app.Activity; |
| 8 import android.app.FragmentManager; | 8 import android.app.FragmentManager; |
| 9 import android.content.Intent; | 9 import android.content.Intent; |
| 10 import android.os.Bundle; | 10 import android.os.Bundle; |
| 11 import android.support.v7.app.ActionBarActivity; | 11 import android.support.v7.app.ActionBarActivity; |
| 12 import android.text.TextUtils; | 12 import android.text.TextUtils; |
| 13 import android.util.Log; | 13 import android.util.Log; |
| 14 import android.view.KeyEvent; | 14 import android.view.KeyEvent; |
| 15 import android.view.Menu; | 15 import android.view.Menu; |
| 16 import android.view.MenuItem; | 16 import android.view.MenuItem; |
| 17 import android.view.View; | 17 import android.view.View; |
| 18 import android.view.ViewGroup; | 18 import android.view.ViewGroup; |
| 19 import android.widget.Toast; | 19 import android.widget.Toast; |
| 20 | 20 |
| 21 import org.chromium.base.ApiCompatibilityUtils; | 21 import org.chromium.base.ApiCompatibilityUtils; |
| 22 import org.chromium.base.BaseSwitches; | 22 import org.chromium.base.BaseSwitches; |
| 23 import org.chromium.base.CommandLine; | 23 import org.chromium.base.CommandLine; |
| 24 import org.chromium.base.ContentUriUtils; | 24 import org.chromium.base.ContentUriUtils; |
| 25 import org.chromium.base.MemoryPressureListener; | 25 import org.chromium.base.MemoryPressureListener; |
| 26 import org.chromium.base.VisibleForTesting; | 26 import org.chromium.base.VisibleForTesting; |
| 27 import org.chromium.base.annotations.SuppressFBWarnings; | 27 import org.chromium.base.annotations.SuppressFBWarnings; |
| 28 import org.chromium.base.library_loader.ProcessInitException; | 28 import org.chromium.base.library_loader.ProcessInitException; |
| 29 import org.chromium.chrome.browser.ChromeBrowserStartupController; |
| 29 import org.chromium.chrome.browser.DevToolsServer; | 30 import org.chromium.chrome.browser.DevToolsServer; |
| 30 import org.chromium.chrome.browser.FileProviderHelper; | 31 import org.chromium.chrome.browser.FileProviderHelper; |
| 31 import org.chromium.chrome.browser.Tab; | 32 import org.chromium.chrome.browser.Tab; |
| 32 import org.chromium.chrome.browser.appmenu.AppMenuHandler; | 33 import org.chromium.chrome.browser.appmenu.AppMenuHandler; |
| 33 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; | 34 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate; |
| 34 import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils; | 35 import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils; |
| 35 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory
; | 36 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory
; |
| 36 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerat
or; | 37 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerat
or; |
| 37 import org.chromium.chrome.browser.nfc.BeamController; | 38 import org.chromium.chrome.browser.nfc.BeamController; |
| 38 import org.chromium.chrome.browser.nfc.BeamProvider; | 39 import org.chromium.chrome.browser.nfc.BeamProvider; |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 @Override | 134 @Override |
| 134 public void onFailure() { | 135 public void onFailure() { |
| 135 Toast.makeText(ChromeShellActivity.this, | 136 Toast.makeText(ChromeShellActivity.this, |
| 136 R.string.browser_process_initialization_f
ailed, | 137 R.string.browser_process_initialization_f
ailed, |
| 137 Toast.LENGTH_SHORT).show(); | 138 Toast.LENGTH_SHORT).show(); |
| 138 Log.e(TAG, "Chromium browser process initialization fail
ed"); | 139 Log.e(TAG, "Chromium browser process initialization fail
ed"); |
| 139 finish(); | 140 finish(); |
| 140 } | 141 } |
| 141 }; | 142 }; |
| 142 try { | 143 try { |
| 143 BrowserStartupController.get(this).startBrowserProcessesAsync(callba
ck); | 144 ChromeBrowserStartupController.get(this).startBrowserProcessesAsync(
callback); |
| 144 } catch (ProcessInitException e) { | 145 } catch (ProcessInitException e) { |
| 145 Log.e(TAG, "Unable to load native library.", e); | 146 Log.e(TAG, "Unable to load native library.", e); |
| 146 System.exit(-1); | 147 System.exit(-1); |
| 147 } | 148 } |
| 148 } | 149 } |
| 149 | 150 |
| 150 private void finishInitialization(final Bundle savedInstanceState) { | 151 private void finishInitialization(final Bundle savedInstanceState) { |
| 151 setContentView(R.layout.chrome_shell_activity); | 152 setContentView(R.layout.chrome_shell_activity); |
| 152 mTabManager = (TabManager) findViewById(R.id.tab_manager); | 153 mTabManager = (TabManager) findViewById(R.id.tab_manager); |
| 153 | 154 |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 /** | 487 /** |
| 487 * Open a dialog that gives the user the option to sign out. | 488 * Open a dialog that gives the user the option to sign out. |
| 488 * | 489 * |
| 489 * @param fragmentManager the FragmentManager. | 490 * @param fragmentManager the FragmentManager. |
| 490 */ | 491 */ |
| 491 private static void openSignOutDialog(FragmentManager fragmentManager) { | 492 private static void openSignOutDialog(FragmentManager fragmentManager) { |
| 492 SignoutFragment signoutFragment = new SignoutFragment(); | 493 SignoutFragment signoutFragment = new SignoutFragment(); |
| 493 signoutFragment.show(fragmentManager, null); | 494 signoutFragment.show(fragmentManager, null); |
| 494 } | 495 } |
| 495 } | 496 } |
| OLD | NEW |