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

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

Issue 11293210: Move global_descriptors to base/posix. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/plugin/plugin_main.cc ('k') | content/public/common/content_descriptors.h » ('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>
11 11
12 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "content/public/browser/file_descriptor_info.h" 13 #include "content/public/browser/file_descriptor_info.h"
14 #include "content/public/common/socket_permission_request.h" 14 #include "content/public/common/socket_permission_request.h"
15 #include "content/public/common/content_client.h" 15 #include "content/public/common/content_client.h"
16 #include "content/public/common/window_container_type.h" 16 #include "content/public/common/window_container_type.h"
17 #include "net/cookies/canonical_cookie.h" 17 #include "net/cookies/canonical_cookie.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresen ter.h" 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresen ter.h"
19 19
20 #if defined(OS_POSIX) && !defined(OS_MACOSX) 20 #if defined(OS_POSIX) && !defined(OS_MACOSX)
21 #include "base/global_descriptors_posix.h" 21 #include "base/posix/global_descriptors.h"
22 #endif 22 #endif
23 23
24 24
25 class CommandLine; 25 class CommandLine;
26 class FilePath; 26 class FilePath;
27 class GURL; 27 class GURL;
28 28
29 namespace webkit_glue { 29 namespace webkit_glue {
30 struct WebPreferences; 30 struct WebPreferences;
31 } 31 }
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 // This is called on a worker thread. 476 // This is called on a worker thread.
477 virtual 477 virtual
478 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 478 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
479 const GURL& url); 479 const GURL& url);
480 #endif 480 #endif
481 }; 481 };
482 482
483 } // namespace content 483 } // namespace content
484 484
485 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 485 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/plugin/plugin_main.cc ('k') | content/public/common/content_descriptors.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698