summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android_webview/android_webview.gyp (renamed from android_webview/lib/android_webview.gyp)31
-rw-r--r--android_webview/aw_browser.gypi11
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc (renamed from android_webview/lib/main/webview_main_delegate.cc)20
-rw-r--r--android_webview/lib/main/aw_main_delegate.h (renamed from android_webview/lib/main/webview_main_delegate.h)14
-rw-r--r--android_webview/lib/main/webview_entry_point.cc4
-rw-r--r--build/all_android.gyp6
6 files changed, 37 insertions, 49 deletions
diff --git a/android_webview/lib/android_webview.gyp b/android_webview/android_webview.gyp
index aea913f..ec9fdbe 100644
--- a/android_webview/lib/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -18,21 +18,20 @@
'<(DEPTH)/chrome/browser/component/components.gyp:browser_component_jni_headers',
],
'include_dirs': [
- '../..',
- '../../skia/config',
+ '<(DEPTH)',
+ '<(DEPTH)/skia/config',
],
'sources': [
- 'aw_browser_dependency_factory_impl.cc',
- 'aw_browser_dependency_factory_impl.h',
- 'aw_content_browser_client.cc',
- 'aw_content_browser_client.h',
- 'main/webview_entry_point.cc',
- 'main/webview_main_delegate.cc',
- 'main/webview_main_delegate.h',
- 'main/webview_stubs.cc',
- ],
- 'includes': [
- '../aw_browser.gypi',
+ 'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
+ 'browser/renderer_host/aw_resource_dispatcher_host_delegate.h',
+ 'lib/aw_browser_dependency_factory_impl.cc',
+ 'lib/aw_browser_dependency_factory_impl.h',
+ 'lib/aw_content_browser_client.cc',
+ 'lib/aw_content_browser_client.h',
+ 'lib/main/aw_main_delegate.cc',
+ 'lib/main/aw_main_delegate.h',
+ 'lib/main/webview_entry_point.cc',
+ 'lib/main/webview_stubs.cc',
],
},
{
@@ -42,7 +41,7 @@
'libwebview',
],
'variables': {
- 'install_binary_script': '../build/install_binary',
+ 'install_binary_script': 'build/install_binary',
},
'actions': [
{
@@ -74,7 +73,7 @@
'package_name': 'android_webview_java',
'java_in_dir': '<(DEPTH)/android_webview/java',
},
- 'includes': [ '../../build/java.gypi' ],
+ 'includes': [ '../build/java.gypi' ],
},
{
'target_name': 'android_webview_javatests',
@@ -90,7 +89,7 @@
'package_name': 'android_webview_javatests',
'java_in_dir': '<(DEPTH)/android_webview/javatests',
},
- 'includes': [ '../../build/java.gypi' ],
+ 'includes': [ '../build/java.gypi' ],
},
{
diff --git a/android_webview/aw_browser.gypi b/android_webview/aw_browser.gypi
deleted file mode 100644
index 8153cf8..0000000
--- a/android_webview/aw_browser.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'sources': [
- 'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
- 'browser/renderer_host/aw_resource_dispatcher_host_delegate.h',
- ],
-}
diff --git a/android_webview/lib/main/webview_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 3e05463..611cf15 100644
--- a/android_webview/lib/main/webview_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "android_webview/lib/main/webview_main_delegate.h"
+#include "android_webview/lib/main/aw_main_delegate.h"
#include "android_webview/lib/aw_browser_dependency_factory_impl.h"
#include "android_webview/lib/aw_content_browser_client.h"
@@ -20,30 +20,30 @@ base::LazyInstance<AwContentBrowserClient>
base::LazyInstance<chrome::ChromeContentRendererClient>
g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
-WebViewMainDelegate::WebViewMainDelegate() {
+AwMainDelegate::AwMainDelegate() {
}
-WebViewMainDelegate::~WebViewMainDelegate() {
+AwMainDelegate::~AwMainDelegate() {
}
-bool WebViewMainDelegate::BasicStartupComplete(int* exit_code) {
+bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
content::SetContentClient(&chrome_content_client_);
return false;
}
-void WebViewMainDelegate::PreSandboxStartup() {
+void AwMainDelegate::PreSandboxStartup() {
chrome::RegisterPathProvider();
// TODO(torne): When we have a separate renderer process, we need to handle
// being passed open FDs for the resource paks here.
}
-void WebViewMainDelegate::SandboxInitialized(const std::string& process_type) {
+void AwMainDelegate::SandboxInitialized(const std::string& process_type) {
// TODO(torne): Adjust linux OOM score here.
}
-int WebViewMainDelegate::RunProcess(
+int AwMainDelegate::RunProcess(
const std::string& process_type,
const content::MainFunctionParams& main_function_params) {
if (process_type.empty()) {
@@ -61,19 +61,19 @@ int WebViewMainDelegate::RunProcess(
return -1;
}
-void WebViewMainDelegate::ProcessExiting(const std::string& process_type) {
+void AwMainDelegate::ProcessExiting(const std::string& process_type) {
// TODO(torne): Clean up resources when we handle them.
logging::CloseLogFile();
}
content::ContentBrowserClient*
- WebViewMainDelegate::CreateContentBrowserClient() {
+ AwMainDelegate::CreateContentBrowserClient() {
return &g_webview_content_browser_client.Get();
}
content::ContentRendererClient*
- WebViewMainDelegate::CreateContentRendererClient() {
+ AwMainDelegate::CreateContentRendererClient() {
return &g_webview_content_renderer_client.Get();
}
diff --git a/android_webview/lib/main/webview_main_delegate.h b/android_webview/lib/main/aw_main_delegate.h
index 572ff0f..d005ef7 100644
--- a/android_webview/lib/main/webview_main_delegate.h
+++ b/android_webview/lib/main/aw_main_delegate.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_LIB_MAIN_WEBVIEW_MAIN_DELEGATE_H_
-#define ANDROID_WEBVIEW_LIB_MAIN_WEBVIEW_MAIN_DELEGATE_H_
+#ifndef ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
+#define ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
#include "base/memory/scoped_ptr.h"
#include "chrome/common/chrome_content_client.h"
@@ -16,10 +16,10 @@ class BrowserMainRunner;
namespace android_webview {
// Android WebView implementation of ContentMainDelegate.
-class WebViewMainDelegate : public content::ContentMainDelegate {
+class AwMainDelegate : public content::ContentMainDelegate {
public:
- WebViewMainDelegate();
- virtual ~WebViewMainDelegate();
+ AwMainDelegate();
+ virtual ~AwMainDelegate();
private:
// content::ContentMainDelegate implementation:
@@ -37,9 +37,9 @@ class WebViewMainDelegate : public content::ContentMainDelegate {
scoped_ptr<content::BrowserMainRunner> browser_runner_;
chrome::ChromeContentClient chrome_content_client_;
- DISALLOW_COPY_AND_ASSIGN(WebViewMainDelegate);
+ DISALLOW_COPY_AND_ASSIGN(AwMainDelegate);
};
} // namespace android_webview
-#endif // ANDROID_WEBVIEW_LIB_MAIN_WEBVIEW_MAIN_DELEGATE_H_
+#endif // ANDROID_WEBVIEW_LIB_MAIN_AW_MAIN_DELEGATE_H_
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index 2053910..567161e 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "android_webview/lib/main/webview_main_delegate.h"
+#include "android_webview/lib/main/aw_main_delegate.h"
#include "android_webview/native/android_webview_jni_registrar.h"
#include "base/android/jni_android.h"
#include "content/public/app/android_library_loader_hooks.h"
@@ -19,7 +19,7 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
if (!android_webview::RegisterJni(env))
return -1;
- content::SetContentMainDelegate(new android_webview::WebViewMainDelegate());
+ content::SetContentMainDelegate(new android_webview::AwMainDelegate());
return JNI_VERSION_1_4;
}
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 181d4da..f692244 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -81,9 +81,9 @@
'target_name': 'android_experimental',
'type': 'none',
'dependencies': [
- '../android_webview/lib/android_webview.gyp:libwebview',
- '../android_webview/lib/android_webview.gyp:android_webview_apk',
- '../android_webview/lib/android_webview.gyp:android_webview_test_apk',
+ '../android_webview/android_webview.gyp:libwebview',
+ '../android_webview/android_webview.gyp:android_webview_apk',
+ '../android_webview/android_webview.gyp:android_webview_test_apk',
],
},
{
generated by cgit v1.1 at 2025-05-20 01:59:37 +0000