Chromium Code Reviews| 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.content_shell; | 5 package org.chromium.content_shell; |
| 6 | 6 |
| 7 import android.app.Activity; | 7 import android.app.Activity; |
| 8 import android.content.Intent; | 8 import android.content.Intent; |
| 9 import android.os.Bundle; | 9 import android.os.Bundle; |
| 10 import android.text.TextUtils; | 10 import android.text.TextUtils; |
| 11 import android.util.Log; | 11 import android.util.Log; |
| 12 import android.view.KeyEvent; | 12 import android.view.KeyEvent; |
| 13 | 13 |
| 14 import org.chromium.content.app.AppResource; | |
| 14 import org.chromium.content.app.LibraryLoader; | 15 import org.chromium.content.app.LibraryLoader; |
| 15 import org.chromium.content.browser.ContentView; | 16 import org.chromium.content.browser.ContentView; |
| 16 import org.chromium.content.common.CommandLine; | 17 import org.chromium.content.common.CommandLine; |
| 17 | 18 |
| 18 /** | 19 /** |
| 19 * Activity for managing the Content Shell. | 20 * Activity for managing the Content Shell. |
| 20 */ | 21 */ |
| 21 public class ContentShellActivity extends Activity { | 22 public class ContentShellActivity extends Activity { |
| 22 | 23 |
| 23 private static final String COMMAND_LINE_FILE = "/data/local/content-shell-c ommand-line"; | 24 private static final String COMMAND_LINE_FILE = "/data/local/content-shell-c ommand-line"; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 } | 92 } |
| 92 | 93 |
| 93 /** | 94 /** |
| 94 * @return The currently visible {@link ShellView} or null if one is not sho wing. | 95 * @return The currently visible {@link ShellView} or null if one is not sho wing. |
| 95 */ | 96 */ |
| 96 public ShellView getActiveShellView() { | 97 public ShellView getActiveShellView() { |
| 97 return mShellManager != null ? mShellManager.getActiveShellView() : null ; | 98 return mShellManager != null ? mShellManager.getActiveShellView() : null ; |
| 98 } | 99 } |
| 99 | 100 |
| 100 private void initializeContentViewResources() { | 101 private void initializeContentViewResources() { |
| 101 ContentView.registerPopupOverlayCornerRadius(0); | 102 AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoome r_overlay; |
| 102 ContentView.registerPopupOverlayResourceId(R.drawable.popup_zoomer_overl ay); | 103 AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview _overlay_radius; |
|
bulach
2012/06/22 15:00:56
nit: maybe keep this sorted (DIMENSION prior to DR
Leandro GraciĆ” Gil
2012/06/22 15:11:59
Done.
| |
| 103 } | 104 } |
| 104 } | 105 } |
| OLD | NEW |