Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Side by Side Diff: content/public/common/content_client.cc

Issue 11615002: Exclude PluginService for builds with enable_plugins==0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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 | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/public/common/content_client.h" 5 #include "content/public/common/content_client.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_piece.h" 8 #include "base/string_piece.h"
9 #include "ui/gfx/image/image.h" 9 #include "ui/gfx/image/image.h"
10 #include "webkit/user_agent/user_agent.h" 10 #include "webkit/user_agent/user_agent.h"
11 11
12 #if !defined(OS_IOS) 12 #if defined(ENABLE_PLUGINS)
13 #include "webkit/plugins/ppapi/host_globals.h" 13 #include "webkit/plugins/ppapi/host_globals.h"
14 #endif 14 #endif
15 15
16 namespace content { 16 namespace content {
17 17
18 static ContentClient* g_client; 18 static ContentClient* g_client;
19 19
20 void SetContentClient(ContentClient* client) { 20 void SetContentClient(ContentClient* client) {
21 g_client = client; 21 g_client = client;
22 22
23 // Set the default user agent as provided by the client. We need to make 23 // Set the default user agent as provided by the client. We need to make
24 // sure this is done before webkit_glue::GetUserAgent() is called (so that 24 // sure this is done before webkit_glue::GetUserAgent() is called (so that
25 // the UA doesn't change). 25 // the UA doesn't change).
26 if (client) { 26 if (client) {
27 webkit_glue::SetUserAgent(client->GetUserAgent(), false); 27 webkit_glue::SetUserAgent(client->GetUserAgent(), false);
28 } 28 }
29 } 29 }
30 30
31 ContentClient* GetContentClient() { 31 ContentClient* GetContentClient() {
32 return g_client; 32 return g_client;
33 } 33 }
34 34
35 const std::string& GetUserAgent(const GURL& url) { 35 const std::string& GetUserAgent(const GURL& url) {
36 DCHECK(g_client); 36 DCHECK(g_client);
37 return webkit_glue::GetUserAgent(url); 37 return webkit_glue::GetUserAgent(url);
38 } 38 }
39 39
40 webkit::ppapi::HostGlobals* GetHostGlobals() { 40 webkit::ppapi::HostGlobals* GetHostGlobals() {
41 #if defined(OS_IOS) 41 #if defined(ENABLE_PLUGINS)
42 return webkit::ppapi::HostGlobals::Get();
43 #else
42 return NULL; 44 return NULL;
43 #else
44 return webkit::ppapi::HostGlobals::Get();
45 #endif 45 #endif
46 } 46 }
47 47
48 ContentClient::ContentClient() 48 ContentClient::ContentClient()
49 : browser_(NULL), plugin_(NULL), renderer_(NULL), utility_(NULL) { 49 : browser_(NULL), plugin_(NULL), renderer_(NULL), utility_(NULL) {
50 } 50 }
51 51
52 ContentClient::~ContentClient() { 52 ContentClient::~ContentClient() {
53 } 53 }
54 54
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 int* sandbox_profile_resource_id) const { 89 int* sandbox_profile_resource_id) const {
90 return false; 90 return false;
91 } 91 }
92 92
93 std::string ContentClient::GetCarbonInterposePath() const { 93 std::string ContentClient::GetCarbonInterposePath() const {
94 return std::string(); 94 return std::string();
95 } 95 }
96 #endif 96 #endif
97 97
98 } // namespace content 98 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698