Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_PROXY_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ |
| 6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ | 6 #define CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/optional.h" | |
|
whywhat
2016/09/13 16:23:26
nit: looks like an accidental change; should be in
Zhiqiang Zhang (Slow)
2016/09/13 18:51:52
Done.
| |
| 12 #include "base/process/kill.h" | 13 #include "base/process/kill.h" |
| 13 #include "content/browser/web_contents/web_contents_impl.h" | 14 #include "content/browser/web_contents/web_contents_impl.h" |
| 14 #include "content/public/browser/reload_type.h" | 15 #include "content/public/browser/reload_type.h" |
| 15 #include "content/public/browser/web_contents_observer.h" | 16 #include "content/public/browser/web_contents_observer.h" |
| 16 #include "content/public/common/frame_navigate_params.h" | 17 #include "content/public/common/frame_navigate_params.h" |
| 17 #include "url/gurl.h" | 18 #include "url/gurl.h" |
| 18 | 19 |
| 19 namespace content { | 20 namespace content { |
| 20 | 21 |
| 21 class RenderViewHost; | 22 class RenderViewHost; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 base::android::ScopedJavaGlobalRef<jobject> java_observer_; | 90 base::android::ScopedJavaGlobalRef<jobject> java_observer_; |
| 90 GURL base_url_of_last_started_data_url_; | 91 GURL base_url_of_last_started_data_url_; |
| 91 | 92 |
| 92 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverProxy); | 93 DISALLOW_COPY_AND_ASSIGN(WebContentsObserverProxy); |
| 93 }; | 94 }; |
| 94 | 95 |
| 95 bool RegisterWebContentsObserverProxy(JNIEnv* env); | 96 bool RegisterWebContentsObserverProxy(JNIEnv* env); |
| 96 } // namespace content | 97 } // namespace content |
| 97 | 98 |
| 98 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ | 99 #endif // CONTENT_BROWSER_ANDROID_WEB_CONTENTS_OBSERVER_PROXY_H_ |
| OLD | NEW |