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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 12805004: Remove mention of the nacl process in content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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 | « no previous file | chrome/browser/chrome_content_browser_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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 content::WebContents* web_contents) OVERRIDE; 220 content::WebContents* web_contents) OVERRIDE;
221 221
222 #if defined(OS_POSIX) && !defined(OS_MACOSX) 222 #if defined(OS_POSIX) && !defined(OS_MACOSX)
223 virtual void GetAdditionalMappedFilesForChildProcess( 223 virtual void GetAdditionalMappedFilesForChildProcess(
224 const CommandLine& command_line, 224 const CommandLine& command_line,
225 int child_process_id, 225 int child_process_id,
226 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 226 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
227 #endif 227 #endif
228 #if defined(OS_WIN) 228 #if defined(OS_WIN)
229 virtual const wchar_t* GetResourceDllName() OVERRIDE; 229 virtual const wchar_t* GetResourceDllName() OVERRIDE;
230 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
231 bool* success) OVERRIDE;
230 #endif 232 #endif
231 #if defined(USE_NSS) 233 #if defined(USE_NSS)
232 virtual 234 virtual
233 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 235 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
234 const GURL& url) OVERRIDE; 236 const GURL& url) OVERRIDE;
235 #endif 237 #endif
236 238
237 // Notification that the application locale has changed. This allows us to 239 // Notification that the application locale has changed. This allows us to
238 // update our I/O thread cache of this value. 240 // update our I/O thread cache of this value.
239 void SetApplicationLocale(const std::string& locale); 241 void SetApplicationLocale(const std::string& locale);
240 242
241 private: 243 private:
242 // Sets io_thread_application_locale_ to the given value. 244 // Sets io_thread_application_locale_ to the given value.
243 void SetApplicationLocaleOnIOThread(const std::string& locale); 245 void SetApplicationLocaleOnIOThread(const std::string& locale);
244 246
245 // Set of origins that can use TCP/UDP private APIs from NaCl. 247 // Set of origins that can use TCP/UDP private APIs from NaCl.
246 std::set<std::string> allowed_socket_origins_; 248 std::set<std::string> allowed_socket_origins_;
247 249
248 // Cached version of the locale so we can return the locale on the I/O 250 // Cached version of the locale so we can return the locale on the I/O
249 // thread. 251 // thread.
250 std::string io_thread_application_locale_; 252 std::string io_thread_application_locale_;
251 253
252 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 254 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
253 }; 255 };
254 256
255 } // namespace chrome 257 } // namespace chrome
256 258
257 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 259 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698