| Index: android_webview/browser/aw_contents.h
|
| diff --git a/android_webview/native/aw_contents.h b/android_webview/browser/aw_contents.h
|
| similarity index 98%
|
| rename from android_webview/native/aw_contents.h
|
| rename to android_webview/browser/aw_contents.h
|
| index 1248bd1791a726df1c8750deffc6566b9f91c88d..f6db4328d81b614c62e70caef7d386af97588892 100644
|
| --- a/android_webview/native/aw_contents.h
|
| +++ b/android_webview/browser/aw_contents.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
|
| -#define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
|
| +#ifndef ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_H_
|
| +#define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_H_
|
|
|
| #include <jni.h>
|
|
|
| @@ -14,17 +14,17 @@
|
|
|
| #include "android_webview/browser/aw_browser_permission_request_delegate.h"
|
| #include "android_webview/browser/aw_render_process_gone_delegate.h"
|
| +#include "android_webview/browser/aw_renderer_priority_manager.h"
|
| #include "android_webview/browser/aw_safe_browsing_ui_manager.h"
|
| #include "android_webview/browser/browser_view_renderer.h"
|
| #include "android_webview/browser/browser_view_renderer_client.h"
|
| #include "android_webview/browser/find_helper.h"
|
| #include "android_webview/browser/gl_view_renderer_manager.h"
|
| #include "android_webview/browser/icon_helper.h"
|
| +#include "android_webview/browser/permission/permission_request_handler_client.h"
|
| #include "android_webview/browser/render_thread_manager.h"
|
| #include "android_webview/browser/render_thread_manager_client.h"
|
| #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
|
| -#include "android_webview/native/aw_renderer_priority_manager.h"
|
| -#include "android_webview/native/permission/permission_request_handler_client.h"
|
| #include "base/android/jni_weak_ref.h"
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/callback_forward.h"
|
| @@ -426,4 +426,4 @@ bool RegisterAwContents(JNIEnv* env);
|
|
|
| } // namespace android_webview
|
|
|
| -#endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
|
| +#endif // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_H_
|
|
|