android_webview/common/aw_content_client.cc - Issue 15702003: Move webkit/user_agent/ into webkit/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: android_webview/common/aw_content_client.cc

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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 | « no previous file | android_webview/native/aw_settings.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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/common/aw_content_client.h"	5 #include "android_webview/common/aw_content_client.h"

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "ipc/ipc_message.h"	8 #include "ipc/ipc_message.h"

9 #include "ui/base/l10n/l10n_util.h"	9 #include "ui/base/l10n/l10n_util.h"

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

11 #include "webkit/user_agent/user_agent_util.h"	11 #include "webkit/common/user_agent/user_agent_util.h"

12	12

13 namespace android_webview {	13 namespace android_webview {

14	14

15 std::string AwContentClient::GetProduct() const {	15 std::string AwContentClient::GetProduct() const {

16 // "Version/4.0" had been hardcoded in the legacy WebView.	16 // "Version/4.0" had been hardcoded in the legacy WebView.

17 return std::string("Version/4.0");	17 return std::string("Version/4.0");

18 }	18 }

19	19

20 std::string AwContentClient::GetUserAgent() const {	20 std::string AwContentClient::GetUserAgent() const {

21 return webkit_glue::BuildUserAgentFromProduct(GetProduct());	21 return webkit_glue::BuildUserAgentFromProduct(GetProduct());

(...skipping 16 matching lines...) Expand all Loading...
38	38

39 bool AwContentClient::CanSendWhileSwappedOut(const IPC::Message* message) {	39 bool AwContentClient::CanSendWhileSwappedOut(const IPC::Message* message) {

40 // For legacy API support we perform a few browser -> renderer synchronous IPC	40 // For legacy API support we perform a few browser -> renderer synchronous IPC

41 // messages that block the browser. However, the synchronous IPC replies might	41 // messages that block the browser. However, the synchronous IPC replies might

42 // be dropped by the renderer during a swap out, deadlocking the browser.	42 // be dropped by the renderer during a swap out, deadlocking the browser.

43 // Because of this we should never drop any synchronous IPC replies.	43 // Because of this we should never drop any synchronous IPC replies.

44 return message->type() == IPC_REPLY_ID;	44 return message->type() == IPC_REPLY_ID;

45 }	45 }

46	46

47 } // namespace android_webview	47 } // namespace android_webview

OLD	NEW