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

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

Issue 18119009: Make utility process run in-process when running in single-process mode. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: undo unnecessary changes Created 7 years, 5 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 | « content/content.gyp ('k') | content/public/common/content_client.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 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
6 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ 6 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // Content's embedder API should only be used by content. 65 // Content's embedder API should only be used by content.
66 ContentClient* GetContentClient(); 66 ContentClient* GetContentClient();
67 #endif 67 #endif
68 68
69 // Used for tests to override the relevant embedder interfaces. Each method 69 // Used for tests to override the relevant embedder interfaces. Each method
70 // returns the old value. 70 // returns the old value.
71 CONTENT_EXPORT ContentBrowserClient* SetBrowserClientForTesting( 71 CONTENT_EXPORT ContentBrowserClient* SetBrowserClientForTesting(
72 ContentBrowserClient* b); 72 ContentBrowserClient* b);
73 CONTENT_EXPORT ContentRendererClient* SetRendererClientForTesting( 73 CONTENT_EXPORT ContentRendererClient* SetRendererClientForTesting(
74 ContentRendererClient* r); 74 ContentRendererClient* r);
75 CONTENT_EXPORT ContentUtilityClient* SetUtilityClientForTesting(
76 ContentUtilityClient* u);
75 77
76 // Returns the user agent string being used by the browser. SetContentClient() 78 // Returns the user agent string being used by the browser. SetContentClient()
77 // must be called prior to calling this, and this routine must be used 79 // must be called prior to calling this, and this routine must be used
78 // instead of webkit_glue::GetUserAgent() in order to ensure that we use 80 // instead of webkit_glue::GetUserAgent() in order to ensure that we use
79 // the same user agent string everywhere. 81 // the same user agent string everywhere.
80 // TODO(dpranke): This is caused by webkit_glue being a library that can 82 // TODO(dpranke): This is caused by webkit_glue being a library that can
81 // get linked into multiple linkable objects, causing us to have multiple 83 // get linked into multiple linkable objects, causing us to have multiple
82 // static values of the user agent. This will be fixed when we clean up 84 // static values of the user agent. This will be fixed when we clean up
83 // webkit_glue. 85 // webkit_glue.
84 CONTENT_EXPORT const std::string& GetUserAgent(const GURL& url); 86 CONTENT_EXPORT const std::string& GetUserAgent(const GURL& url);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 ContentPluginClient* plugin_; 181 ContentPluginClient* plugin_;
180 // The embedder API for participating in renderer logic. 182 // The embedder API for participating in renderer logic.
181 ContentRendererClient* renderer_; 183 ContentRendererClient* renderer_;
182 // The embedder API for participating in utility logic. 184 // The embedder API for participating in utility logic.
183 ContentUtilityClient* utility_; 185 ContentUtilityClient* utility_;
184 }; 186 };
185 187
186 } // namespace content 188 } // namespace content
187 189
188 #endif // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ 190 #endif // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | content/public/common/content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698