| Index: android_webview/common/aw_content_client.h
|
| diff --git a/content/shell/shell_content_client.h b/android_webview/common/aw_content_client.h
|
| similarity index 58%
|
| copy from content/shell/shell_content_client.h
|
| copy to android_webview/common/aw_content_client.h
|
| index 578dddb6828d4d3eb38a2f51cdec683f9a83f887..e0b5c24d2226099fa08869c9dafff7ffe16817be 100644
|
| --- a/content/shell/shell_content_client.h
|
| +++ b/android_webview/common/aw_content_client.h
|
| @@ -2,21 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_SHELL_SHELL_CONTENT_CLIENT_H_
|
| -#define CONTENT_SHELL_SHELL_CONTENT_CLIENT_H_
|
| +#ifndef ANDROID_WEBVIEW_COMMON_AW_CONTENT_CLIENT_H_
|
| +#define ANDROID_WEBVIEW_COMMON_AW_CONTENT_CLIENT_H_
|
|
|
| -#include <string>
|
| -#include <vector>
|
| +#include "content/public/common/content_client.h"
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "content/public/common/content_client.h"
|
|
|
| -namespace content {
|
| +namespace android_webview {
|
|
|
| -class ShellContentClient : public ContentClient {
|
| +class AwContentClient : public content::ContentClient {
|
| public:
|
| - virtual ~ShellContentClient();
|
| -
|
| + // ContentClient implementation.
|
| + virtual std::string GetProduct() const OVERRIDE;
|
| virtual std::string GetUserAgent() const OVERRIDE;
|
| virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
|
| virtual base::StringPiece GetDataResource(
|
| @@ -24,6 +22,6 @@ class ShellContentClient : public ContentClient {
|
| ui::ScaleFactor scale_factor) const OVERRIDE;
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace android_webview
|
|
|
| -#endif // CONTENT_SHELL_SHELL_CONTENT_CLIENT_H_
|
| +#endif // ANDROID_WEBVIEW_COMMON_AW_CONTENT_CLIENT_H_
|
|
|