Implement AwContentsClient and remove dependency on chrome/

android_webview/common/aw_content_client.cc

Index: android_webview/common/aw_content_client.cc
diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c8823e65c667e98eb3b311d4e47732fdcac5360a
--- /dev/null
+++ b/android_webview/common/aw_content_client.cc
@@ -0,0 +1,39 @@
+// 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.
+
+#include "android_webview/common/aw_content_client.h"
+
+#include "base/basictypes.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "webkit/user_agent/user_agent_util.h"
+
+namespace android_webview {
+
+std::string AwContentClient::GetProduct() const {
+  // "Version/4.0" had been hardcoded in the legacy WebView.
+  return std::string("Version/4.0");
+}
+
+std::string AwContentClient::GetUserAgent() const {
+  return webkit_glue::BuildUserAgentFromProduct(GetProduct());

[joth, 2012/10/09 19:53:37]

Mikhail and I were actually agreeing ot remove these methods... However I like
the idea of this being here rather than in the GetDefaultUserAgent imp, so lets
go with this.

aside - tracing through the glue layer and into ContentViewCore.loadURL() I
can't actually see where we hook the ('override') UA out of the settings
instance and pass down into the load. When Martin has added AwContents.loadURL
that will be the obvious place to do that.
Also having  a sane default set here then it gives us the option in future to
only supply the override to the NavigationEntry if the embedder has actually set
an override...

[boliu, 2012/10/09 20:05:54]

The UA override logic is all very complicated.....

First, for webview, we are setting the *override* ua every time the ua in
ContentSettings change. This is done by calling
ContentViewCore.setAllUserAgentOverridesInHistory in ContentViewCore.initialize
and every time ContentSettings ua changes, so this ensures for webview, the
override is always the correct ua we want.

Then in ContentViewCore.loadUrl, we set the request to use the override ua.

Now the path is used to get the *default* ua, when the webview client calls
setUserAgentString with null.

I think I got the details right here, but of course Mikhail can correct me if
anything is wrong.

+}
+
+string16 AwContentClient::GetLocalizedString(int message_id) const {
+  // TODO(boliu): Used only by WebKit, so only bundle those resources for
+  // Android WebView.
+  return l10n_util::GetStringUTF16(message_id);
+}
+
+base::StringPiece AwContentClient::GetDataResource(
+    int resource_id,
+    ui::ScaleFactor scale_factor) const {
+  // TODO(boliu): Used only by WebKit, so only bundle those resources for
+  // Android WebView.
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      resource_id, scale_factor);
+}
+
+}  // namespace android_webview
+