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 #include "content/shell/shell.h" | 5 #include "content/shell/shell.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 63 void Shell::LoadProgressChanged(double progress) { | 63 void Shell::LoadProgressChanged(double progress) { |
| 64 JNIEnv* env = AttachCurrentThread(); | 64 JNIEnv* env = AttachCurrentThread(); |
| 65 Java_Shell_onLoadProgressChanged(env, java_object_.obj(), progress); | 65 Java_Shell_onLoadProgressChanged(env, java_object_.obj(), progress); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void Shell::Close() { | 68 void Shell::Close() { |
| 69 // TODO(tedchoc): Implement Close method for android shell | 69 // TODO(tedchoc): Implement Close method for android shell |
| 70 NOTIMPLEMENTED(); | 70 NOTIMPLEMENTED(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 void Shell::AttachLayer(WebContents* web_contents, WebKit::WebLayer& layer) { | |
|
klobag.chromium
2012/08/22 07:01:19
const WebLayer&
| |
| 74 ShellAttachLayer(layer); | |
| 75 } | |
| 76 | |
| 77 void Shell::RemoveLayer(WebContents* web_contents, WebKit::WebLayer& layer) { | |
| 78 ShellRemoveLayer(layer); | |
| 79 } | |
| 80 | |
| 73 // static | 81 // static |
| 74 bool Shell::Register(JNIEnv* env) { | 82 bool Shell::Register(JNIEnv* env) { |
| 75 return RegisterNativesImpl(env); | 83 return RegisterNativesImpl(env); |
| 76 } | 84 } |
| 77 | 85 |
| 78 } // namespace content | 86 } // namespace content |
| OLD | NEW |