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

Side by Side Diff: content/shell/shell_main_delegate.cc

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/shell/android/shell_descriptors.h ('k') | content/zygote/zygote_linux.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/shell/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 14 matching lines...) Expand all
25 25
26 #if defined(IPC_MESSAGE_LOG_ENABLED) 26 #if defined(IPC_MESSAGE_LOG_ENABLED)
27 #define IPC_MESSAGE_MACROS_LOG_ENABLED 27 #define IPC_MESSAGE_MACROS_LOG_ENABLED
28 #include "content/public/common/content_ipc_logging.h" 28 #include "content/public/common/content_ipc_logging.h"
29 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ 29 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
30 content::RegisterIPCLogger(msg_id, logger) 30 content::RegisterIPCLogger(msg_id, logger)
31 #include "content/shell/shell_messages.h" 31 #include "content/shell/shell_messages.h"
32 #endif 32 #endif
33 33
34 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
35 #include "base/global_descriptors_posix.h" 35 #include "base/posix/global_descriptors.h"
36 #include "content/shell/android/shell_descriptors.h" 36 #include "content/shell/android/shell_descriptors.h"
37 #endif 37 #endif
38 38
39 #if defined(OS_MACOSX) 39 #if defined(OS_MACOSX)
40 #include "content/shell/paths_mac.h" 40 #include "content/shell/paths_mac.h"
41 #endif // OS_MACOSX 41 #endif // OS_MACOSX
42 42
43 #if defined(OS_WIN) 43 #if defined(OS_WIN)
44 #include "base/logging_win.h" 44 #include "base/logging_win.h"
45 #include <initguid.h> 45 #include <initguid.h>
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 browser_client_.reset(new ShellContentBrowserClient); 182 browser_client_.reset(new ShellContentBrowserClient);
183 return browser_client_.get(); 183 return browser_client_.get();
184 } 184 }
185 185
186 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 186 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
187 renderer_client_.reset(new ShellContentRendererClient); 187 renderer_client_.reset(new ShellContentRendererClient);
188 return renderer_client_.get(); 188 return renderer_client_.get();
189 } 189 }
190 190
191 } // namespace content 191 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/android/shell_descriptors.h ('k') | content/zygote/zygote_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698