summaryrefslogtreecommitdiffstats
path: root/android_webview/native
diff options
context:
space:
mode:
authorkristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 09:45:14 +0000
committerkristianm@chromium.org <kristianm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 09:45:14 +0000
commita5c6481d49c8ace0e2b6ea47f5b6f5387765b402 (patch)
tree02e2f1bc84201cf90ab372fbb3eff7412fe33c74 /android_webview/native
parent71fdaada7e00955c156df7b6abfd97872ded6868 (diff)
downloadchromium_src-a5c6481d49c8ace0e2b6ea47f5b6f5387765b402.zip
chromium_src-a5c6481d49c8ace0e2b6ea47f5b6f5387765b402.tar.gz
chromium_src-a5c6481d49c8ace0e2b6ea47f5b6f5387765b402.tar.bz2
Renaming CookieManager to AwCookieManager to avoid name conflict with android.webview.CookieManager
Part 1 of renaming CookieManager to AwCookieManager BUG= Review URL: https://chromiumcodereview.appspot.com/11614014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
-rw-r--r--android_webview/native/webview_native.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index a4b62f6..88f7fd9 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -72,6 +72,7 @@
'../java/src/org/chromium/android_webview/AndroidProtocolHandler.java',
'../java/src/org/chromium/android_webview/AwContents.java',
'../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java',
+ '../java/src/org/chromium/android_webview/AwCookieManager.java',
'../java/src/org/chromium/android_webview/AwHttpAuthHandler.java',
'../java/src/org/chromium/android_webview/AwResource.java',
'../java/src/org/chromium/android_webview/AwWebContentsDelegate.java',