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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/android/jni_helper.h" | 10 #include "base/android/jni_helper.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 // Called when page loading begins. | 162 // Called when page loading begins. |
| 163 void DidStartLoading(); | 163 void DidStartLoading(); |
| 164 void StartContentIntent(const GURL& content_url); | 164 void StartContentIntent(const GURL& content_url); |
| 165 | 165 |
| 166 // -------------------------------------------------------------------------- | 166 // -------------------------------------------------------------------------- |
| 167 // Methods called from native code | 167 // Methods called from native code |
| 168 // -------------------------------------------------------------------------- | 168 // -------------------------------------------------------------------------- |
| 169 | 169 |
| 170 gfx::Rect GetBounds() const; | 170 gfx::Rect GetBounds() const; |
| 171 | 171 |
| 172 WebContents* web_contents() const { return web_contents_; } | 172 virtual WebContents* web_contents() const OVERRIDE; |
|
Ted C
2012/09/17 18:19:44
Hmm...I thought the hacker style naming was only f
jam
2012/09/18 19:15:22
correct, this should be GetWebContents()
web_cont
nilesh
2012/09/18 20:47:12
Renamed to GetWebContents()
| |
| 173 | |
| 174 virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE; | 173 virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE; |
| 175 | 174 |
| 176 private: | 175 private: |
| 177 // NotificationObserver implementation. | 176 // NotificationObserver implementation. |
| 178 virtual void Observe(int type, | 177 virtual void Observe(int type, |
| 179 const NotificationSource& source, | 178 const NotificationSource& source, |
| 180 const NotificationDetails& details) OVERRIDE; | 179 const NotificationDetails& details) OVERRIDE; |
| 181 | 180 |
| 182 // -------------------------------------------------------------------------- | 181 // -------------------------------------------------------------------------- |
| 183 // Private methods that call to Java via JNI | 182 // Private methods that call to Java via JNI |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 bool tab_crashed_; | 216 bool tab_crashed_; |
| 218 | 217 |
| 219 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); | 218 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); |
| 220 }; | 219 }; |
| 221 | 220 |
| 222 bool RegisterContentViewCore(JNIEnv* env); | 221 bool RegisterContentViewCore(JNIEnv* env); |
| 223 | 222 |
| 224 } // namespace content | 223 } // namespace content |
| 225 | 224 |
| 226 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 225 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| OLD | NEW |