OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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.android_webview.shell; | 5 package org.chromium.android_webview.shell; |
6 | 6 |
7 import android.app.Application; | 7 import android.app.Application; |
8 import android.content.Context; | 8 import android.content.Context; |
9 import android.os.Debug; | 9 import android.os.Debug; |
10 import android.util.Log; | 10 import android.util.Log; |
(...skipping 10 matching lines...) Expand all Loading... | |
21 "webviewchromium.pak", "en-US.pak" | 21 "webviewchromium.pak", "en-US.pak" |
22 }; | 22 }; |
23 | 23 |
24 @Override | 24 @Override |
25 public void onCreate() { | 25 public void onCreate() { |
26 super.onCreate(); | 26 super.onCreate(); |
27 | 27 |
28 AwShellResourceProvider.registerResources(this); | 28 AwShellResourceProvider.registerResources(this); |
29 | 29 |
30 CommandLine.initFromFile("/data/local/chrome-command-line"); | 30 CommandLine.initFromFile("/data/local/chrome-command-line"); |
31 // TODO(michaelbai) : Remove this once we fully move to UI/compositor th read merge mode. | |
32 if (!CommandLine.getInstance().hasSwitch("merge-ui-and-compositor-thread s")) { | |
33 CommandLine.getInstance().appendSwitch("no-merge-ui-and-compositor-t hreads"); | |
34 } | |
joth
2013/04/26 18:06:44
The plan was not to add this here to get upstream
michaelbai
2013/04/26 21:41:43
We want to run downstream in no-merge mode and ups
joth
2013/04/26 21:52:35
(Note this file is not used in downstream)
The dif
| |
31 | 35 |
32 if (CommandLine.getInstance().hasSwitch(CommandLine.WAIT_FOR_JAVA_DEBUGG ER)) { | 36 if (CommandLine.getInstance().hasSwitch(CommandLine.WAIT_FOR_JAVA_DEBUGG ER)) { |
33 Log.e(TAG, "Waiting for Java debugger to connect..."); | 37 Log.e(TAG, "Waiting for Java debugger to connect..."); |
34 Debug.waitForDebugger(); | 38 Debug.waitForDebugger(); |
35 Log.e(TAG, "Java debugger connected. Resuming execution."); | 39 Log.e(TAG, "Java debugger connected. Resuming execution."); |
36 } | 40 } |
37 | 41 |
38 ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAKS); | 42 ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAKS); |
39 ResourceExtractor.setExtractImplicitLocaleForTesting(false); | 43 ResourceExtractor.setExtractImplicitLocaleForTesting(false); |
40 AwBrowserProcess.loadLibrary(); | 44 AwBrowserProcess.loadLibrary(); |
41 AwBrowserProcess.start(this); | 45 AwBrowserProcess.start(this); |
42 } | 46 } |
43 } | 47 } |
OLD | NEW |