trunk/src/chrome/common/chrome_content_client.h - Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..."

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: trunk/src/chrome/common/chrome_content_client.h

Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 9 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 | « trunk/src/chrome/chrome_browser.gypi ('k') | trunk/src/chrome/common/chrome_content_client.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 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_	5 #ifndef CHROME_COMMON_CHROME_CONTENT_CLIENT_H_

6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_	6 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/compiler_specific.h"	11 #include "base/compiler_specific.h"

12 #include "base/files/file_path.h"	12 #include "base/files/file_path.h"

13 #include "content/public/common/content_client.h"	13 #include "content/public/common/content_client.h"

14	14

15 // Returns the user agent of Chrome.

16 std::string GetUserAgent();

17

18 class ChromeContentClient : public content::ContentClient {	15 class ChromeContentClient : public content::ContentClient {

19 public:	16 public:

20 static const char* const kPDFPluginName;	17 static const char* const kPDFPluginName;

21 static const char* const kNaClPluginName;	18 static const char* const kNaClPluginName;

22 static const char* const kNaClOldPluginName;	19 static const char* const kNaClOldPluginName;

23 static const char* const kRemotingViewerPluginPath;	20 static const char* const kRemotingViewerPluginPath;

24	21

25 virtual void SetActiveURL(const GURL& url) OVERRIDE;	22 virtual void SetActiveURL(const GURL& url) OVERRIDE;

26 virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) OVERRIDE;	23 virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) OVERRIDE;

27 virtual void AddPepperPlugins(	24 virtual void AddPepperPlugins(

(...skipping 15 matching lines...) Expand all Loading...
43	40

44 #if defined(OS_MACOSX) && !defined(OS_IOS)	41 #if defined(OS_MACOSX) && !defined(OS_IOS)

45 virtual bool GetSandboxProfileForSandboxType(	42 virtual bool GetSandboxProfileForSandboxType(

46 int sandbox_type,	43 int sandbox_type,

47 int* sandbox_profile_resource_id) const OVERRIDE;	44 int* sandbox_profile_resource_id) const OVERRIDE;

48 virtual std::string GetCarbonInterposePath() const OVERRIDE;	45 virtual std::string GetCarbonInterposePath() const OVERRIDE;

49 #endif	46 #endif

50 };	47 };

51	48

52 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_	49 #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_

OLD	NEW