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

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

Issue 11347012: Split IPC logging between content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates 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
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"
11 #include "content/public/browser/browser_main_runner.h" 11 #include "content/public/browser/browser_main_runner.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 #include "content/public/common/url_constants.h" 13 #include "content/public/common/url_constants.h"
14 #include "content/shell/shell_browser_main.h" 14 #include "content/shell/shell_browser_main.h"
15 #include "content/shell/shell_content_browser_client.h" 15 #include "content/shell/shell_content_browser_client.h"
16 #include "content/shell/shell_content_renderer_client.h" 16 #include "content/shell/shell_content_renderer_client.h"
17 #include "content/shell/shell_switches.h" 17 #include "content/shell/shell_switches.h"
18 #include "content/shell/webkit_test_platform_support.h" 18 #include "content/shell/webkit_test_platform_support.h"
19 #include "net/cookies/cookie_monster.h" 19 #include "net/cookies/cookie_monster.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/base/ui_base_paths.h" 21 #include "ui/base/ui_base_paths.h"
22 #include "ui/gl/gl_switches.h" 22 #include "ui/gl/gl_switches.h"
23 23
24 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
25
26 #if defined(OS_POSIX) && defined(IPC_MESSAGE_LOG_ENABLED)
27 #define IPC_MESSAGE_MACROS_LOG_ENABLED
28 #include "content/public/common/content_ipc_logging.h"
29 #define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \
30 content::RegisterIPCLogger(msg_id, logger)
31 #include "content/shell/shell_messages.h"
32 #endif
33
24 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
25 #include "base/global_descriptors_posix.h" 35 #include "base/global_descriptors_posix.h"
26 #include "content/shell/android/shell_descriptors.h" 36 #include "content/shell/android/shell_descriptors.h"
27 #endif 37 #endif
28 38
29 #if defined(OS_MACOSX) 39 #if defined(OS_MACOSX)
30 #include "content/shell/paths_mac.h" 40 #include "content/shell/paths_mac.h"
31 #endif // OS_MACOSX 41 #endif // OS_MACOSX
32 42
33 #if defined(OS_WIN) 43 #if defined(OS_WIN)
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 browser_client_.reset(new ShellContentBrowserClient); 182 browser_client_.reset(new ShellContentBrowserClient);
173 return browser_client_.get(); 183 return browser_client_.get();
174 } 184 }
175 185
176 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 186 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
177 renderer_client_.reset(new ShellContentRendererClient); 187 renderer_client_.reset(new ShellContentRendererClient);
178 return renderer_client_.get(); 188 return renderer_client_.get();
179 } 189 }
180 190
181 } // namespace content 191 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698