Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(993)

Side by Side Diff: content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

Issue 227803004: ContentView->ContentViewCore in ContentViewRenderView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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.Context; 8 import android.content.Context;
9 import android.util.AttributeSet; 9 import android.util.AttributeSet;
10 import android.view.LayoutInflater; 10 import android.view.LayoutInflater;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 return shellView; 146 return shellView;
147 } 147 }
148 148
149 private void showShell(Shell shellView) { 149 private void showShell(Shell shellView) {
150 shellView.setContentViewRenderView(mContentViewRenderView); 150 shellView.setContentViewRenderView(mContentViewRenderView);
151 addView(shellView, new FrameLayout.LayoutParams( 151 addView(shellView, new FrameLayout.LayoutParams(
152 FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams. MATCH_PARENT)); 152 FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams. MATCH_PARENT));
153 mActiveShell = shellView; 153 mActiveShell = shellView;
154 ContentView contentView = mActiveShell.getContentView(); 154 ContentView contentView = mActiveShell.getContentView();
155 if (contentView != null) { 155 if (contentView != null) {
156 mContentViewRenderView.setCurrentContentView(contentView); 156 mContentViewRenderView.setCurrentContentViewCore(contentView.getCont entViewCore());
157 contentView.onShow(); 157 contentView.getContentViewCore().onShow();
Yaron 2014/04/07 18:48:32 Oops. this bled in. No harm though for fixing now.
158 } 158 }
159 } 159 }
160 160
161 @CalledByNative 161 @CalledByNative
162 private void removeShell(Shell shellView) { 162 private void removeShell(Shell shellView) {
163 if (shellView == mActiveShell) mActiveShell = null; 163 if (shellView == mActiveShell) mActiveShell = null;
164 if (shellView.getParent() == null) return; 164 if (shellView.getParent() == null) return;
165 ContentView contentView = shellView.getContentView(); 165 ContentView contentView = shellView.getContentView();
166 if (contentView != null) contentView.onHide(); 166 if (contentView != null) contentView.onHide();
167 shellView.setContentViewRenderView(null); 167 shellView.setContentViewRenderView(null);
168 removeView(shellView); 168 removeView(shellView);
169 } 169 }
170 170
171 private static native void nativeInit(Object shellManagerInstance); 171 private static native void nativeInit(Object shellManagerInstance);
172 private static native void nativeLaunchShell(String url); 172 private static native void nativeLaunchShell(String url);
173 } 173 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698