android_webview/native/aw_contents.cc - Issue 17392006: In components/autofill, move browser/ to core/browser/

Side by Side Diff: android_webview/native/aw_contents.cc

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to fix conflicts Created 7 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « android_webview/native/DEPS ('k') | android_webview/native/aw_form_database.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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 #include "android_webview/native/aw_contents.h"	5 #include "android_webview/native/aw_contents.h"

6	6

7 #include "android_webview/browser/aw_browser_context.h"	7 #include "android_webview/browser/aw_browser_context.h"

8 #include "android_webview/browser/aw_browser_main_parts.h"	8 #include "android_webview/browser/aw_browser_main_parts.h"

9 #include "android_webview/browser/gpu_memory_buffer_impl.h"	9 #include "android_webview/browser/gpu_memory_buffer_impl.h"

10 #include "android_webview/browser/in_process_view_renderer.h"	10 #include "android_webview/browser/in_process_view_renderer.h"

(...skipping 10 matching lines...) Expand all Loading...
21 #include "base/android/jni_android.h"	21 #include "base/android/jni_android.h"

22 #include "base/android/jni_array.h"	22 #include "base/android/jni_array.h"

23 #include "base/android/jni_string.h"	23 #include "base/android/jni_string.h"

24 #include "base/android/scoped_java_ref.h"	24 #include "base/android/scoped_java_ref.h"

25 #include "base/bind.h"	25 #include "base/bind.h"

26 #include "base/callback.h"	26 #include "base/callback.h"

27 #include "base/message_loop.h"	27 #include "base/message_loop.h"

28 #include "base/pickle.h"	28 #include "base/pickle.h"

29 #include "base/strings/string16.h"	29 #include "base/strings/string16.h"

30 #include "base/supports_user_data.h"	30 #include "base/supports_user_data.h"

31 #include "components/autofill/browser/autofill_manager.h"

32 #include "components/autofill/browser/webdata/autofill_webdata_service.h"

33 #include "components/autofill/content/browser/autofill_driver_impl.h"	31 #include "components/autofill/content/browser/autofill_driver_impl.h"

	32 #include "components/autofill/core/browser/autofill_manager.h"

	33 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"

34 #include "components/navigation_interception/intercept_navigation_delegate.h"	34 #include "components/navigation_interception/intercept_navigation_delegate.h"

35 #include "content/public/browser/android/content_view_core.h"	35 #include "content/public/browser/android/content_view_core.h"

36 #include "content/public/browser/browser_thread.h"	36 #include "content/public/browser/browser_thread.h"

37 #include "content/public/browser/cert_store.h"	37 #include "content/public/browser/cert_store.h"

38 #include "content/public/browser/navigation_entry.h"	38 #include "content/public/browser/navigation_entry.h"

39 #include "content/public/browser/render_process_host.h"	39 #include "content/public/browser/render_process_host.h"

40 #include "content/public/browser/render_view_host.h"	40 #include "content/public/browser/render_view_host.h"

41 #include "content/public/browser/web_contents.h"	41 #include "content/public/browser/web_contents.h"

42 #include "content/public/common/ssl_status.h"	42 #include "content/public/common/ssl_status.h"

43 #include "jni/AwContents_jni.h"	43 #include "jni/AwContents_jni.h"

(...skipping 645 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
689 return browser_view_renderer_->CapturePicture();	689 return browser_view_renderer_->CapturePicture();

690 }	690 }

691	691

692 void AwContents::EnableOnNewPicture(JNIEnv* env,	692 void AwContents::EnableOnNewPicture(JNIEnv* env,

693 jobject obj,	693 jobject obj,

694 jboolean enabled) {	694 jboolean enabled) {

695 browser_view_renderer_->EnableOnNewPicture(enabled);	695 browser_view_renderer_->EnableOnNewPicture(enabled);

696 }	696 }

697	697

698 } // namespace android_webview	698 } // namespace android_webview

OLD	NEW