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

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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_resources.grd ('k') | content/public/browser/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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 class CookieOptions; 45 class CookieOptions;
46 class HttpNetworkSession; 46 class HttpNetworkSession;
47 class NetLog; 47 class NetLog;
48 class SSLCertRequestInfo; 48 class SSLCertRequestInfo;
49 class SSLInfo; 49 class SSLInfo;
50 class URLRequest; 50 class URLRequest;
51 class URLRequestContext; 51 class URLRequestContext;
52 class X509Certificate; 52 class X509Certificate;
53 } 53 }
54 54
55 namespace ui {
56 class SelectFilePolicy;
57 }
58
59 namespace content { 55 namespace content {
60 56
61 class AccessTokenStore; 57 class AccessTokenStore;
62 class BrowserChildProcessHost; 58 class BrowserChildProcessHost;
63 class BrowserContext; 59 class BrowserContext;
64 class BrowserMainParts; 60 class BrowserMainParts;
65 class BrowserPpapiHost; 61 class BrowserPpapiHost;
66 class BrowserURLHandler; 62 class BrowserURLHandler;
67 class MediaObserver; 63 class MediaObserver;
68 class QuotaPermissionContext; 64 class QuotaPermissionContext;
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 437
442 // Returns true if renderer processes can use Pepper TCP/UDP sockets from 438 // Returns true if renderer processes can use Pepper TCP/UDP sockets from
443 // the given origin and connection type. 439 // the given origin and connection type.
444 virtual bool AllowPepperSocketAPI(BrowserContext* browser_context, 440 virtual bool AllowPepperSocketAPI(BrowserContext* browser_context,
445 const GURL& url, 441 const GURL& url,
446 const SocketPermissionRequest& params); 442 const SocketPermissionRequest& params);
447 443
448 // Returns the directory containing hyphenation dictionaries. 444 // Returns the directory containing hyphenation dictionaries.
449 virtual FilePath GetHyphenDictionaryDirectory(); 445 virtual FilePath GetHyphenDictionaryDirectory();
450 446
451 // Returns an implementation of a file selecition policy. Can return NULL.
452 virtual ui::SelectFilePolicy* CreateSelectFilePolicy(
453 WebContents* web_contents);
454
455 #if defined(OS_POSIX) && !defined(OS_MACOSX) 447 #if defined(OS_POSIX) && !defined(OS_MACOSX)
456 // Populates |mappings| with all files that need to be mapped before launching 448 // Populates |mappings| with all files that need to be mapped before launching
457 // a child process. 449 // a child process.
458 virtual void GetAdditionalMappedFilesForChildProcess( 450 virtual void GetAdditionalMappedFilesForChildProcess(
459 const CommandLine& command_line, 451 const CommandLine& command_line,
460 int child_process_id, 452 int child_process_id,
461 std::vector<FileDescriptorInfo>* mappings) {} 453 std::vector<FileDescriptorInfo>* mappings) {}
462 #endif 454 #endif
463 455
464 #if defined(OS_WIN) 456 #if defined(OS_WIN)
465 // Returns the name of the dll that contains cursors and other resources. 457 // Returns the name of the dll that contains cursors and other resources.
466 virtual const wchar_t* GetResourceDllName(); 458 virtual const wchar_t* GetResourceDllName();
467 #endif 459 #endif
468 460
469 #if defined(USE_NSS) 461 #if defined(USE_NSS)
470 // Return a delegate to authenticate and unlock |module|. 462 // Return a delegate to authenticate and unlock |module|.
471 // This is called on a worker thread. 463 // This is called on a worker thread.
472 virtual 464 virtual
473 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 465 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
474 const GURL& url); 466 const GURL& url);
475 #endif 467 #endif
476 }; 468 };
477 469
478 } // namespace content 470 } // namespace content
479 471
480 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 472 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/content_resources.grd ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698