Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2289)

Unified Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 11471040: [Android WebView] Convert context menu callback to long press (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forward declare Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.h ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/lib/main/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 7082797df069ab2dfe0882c9648740d7b7a5bac2..379dbe82d9999aa55bfa4b97e8f513bf8a570fe5 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -6,6 +6,7 @@
#include "android_webview/browser/aw_content_browser_client.h"
#include "android_webview/lib/aw_browser_dependency_factory_impl.h"
+#include "android_webview/native/aw_web_contents_view_delegate.h"
#include "android_webview/renderer/aw_content_renderer_client.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
@@ -14,8 +15,6 @@
namespace android_webview {
-base::LazyInstance<AwContentBrowserClient>
- g_webview_content_browser_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<AwContentRendererClient>
g_webview_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
@@ -66,12 +65,16 @@ void AwMainDelegate::ProcessExiting(const std::string& process_type) {
content::ContentBrowserClient*
AwMainDelegate::CreateContentBrowserClient() {
- return &g_webview_content_browser_client.Get();
+ content_browser_client_.reset(
+ new AwContentBrowserClient(&AwWebContentsViewDelegate::Create));
+
+ return content_browser_client_.get();
}
content::ContentRendererClient*
AwMainDelegate::CreateContentRendererClient() {
- return &g_webview_content_renderer_client.Get();
+ content_renderer_client_.reset(new AwContentRendererClient());
+ return content_renderer_client_.get();
}
} // namespace android_webview
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.h ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698