| 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_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include "base/android/jni_helper.h" | 10 #include "base/android/jni_helper.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 const GURL& validated_url, | 38 const GURL& validated_url, |
| 39 int error_code, | 39 int error_code, |
| 40 const string16& error_description, | 40 const string16& error_description, |
| 41 RenderViewHost* render_view_host) OVERRIDE; | 41 RenderViewHost* render_view_host) OVERRIDE; |
| 42 virtual void DidFailLoad(int64 frame_id, | 42 virtual void DidFailLoad(int64 frame_id, |
| 43 const GURL& validated_url, | 43 const GURL& validated_url, |
| 44 bool is_main_frame, | 44 bool is_main_frame, |
| 45 int error_code, | 45 int error_code, |
| 46 const string16& error_description, | 46 const string16& error_description, |
| 47 RenderViewHost* render_view_host) OVERRIDE; | 47 RenderViewHost* render_view_host) OVERRIDE; |
| 48 virtual void DidNavigateMainFrame(const LoadCommittedDetails& details, | |
| 49 const FrameNavigateParams& params) OVERRIDE; | |
| 50 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; | 48 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; |
| 51 | 49 |
| 52 void DidFailLoadInternal(bool is_provisional_load, | 50 void DidFailLoadInternal(bool is_provisional_load, |
| 53 bool is_main_frame, | 51 bool is_main_frame, |
| 54 int error_code, | 52 int error_code, |
| 55 const string16& description, | 53 const string16& description, |
| 56 const GURL& url); | 54 const GURL& url); |
| 57 | 55 |
| 58 JavaObjectWeakGlobalRef weak_java_observer_; | 56 JavaObjectWeakGlobalRef weak_java_observer_; |
| 59 | 57 |
| 60 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid); | 58 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverAndroid); |
| 61 }; | 59 }; |
| 62 | 60 |
| 63 bool RegisterWebContentsObserverAndroid(JNIEnv* env); | 61 bool RegisterWebContentsObserverAndroid(JNIEnv* env); |
| 64 } // namespace content | 62 } // namespace content |
| 65 | 63 |
| 66 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ | 64 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_ANDROID_H_ |
| OLD | NEW |