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

Side by Side Diff: content/app/content_main_runner.cc

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 years, 5 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 | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/app/startup_helper_win.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/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include "base/allocator/allocator_extension.h" 7 #include "base/allocator/allocator_extension.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
(...skipping 19 matching lines...) Expand all
30 #include "content/public/common/content_paths.h" 30 #include "content/public/common/content_paths.h"
31 #include "content/public/common/content_switches.h" 31 #include "content/public/common/content_switches.h"
32 #include "content/public/common/main_function_params.h" 32 #include "content/public/common/main_function_params.h"
33 #include "content/public/common/sandbox_init.h" 33 #include "content/public/common/sandbox_init.h"
34 #include "content/public/plugin/content_plugin_client.h" 34 #include "content/public/plugin/content_plugin_client.h"
35 #include "content/public/renderer/content_renderer_client.h" 35 #include "content/public/renderer/content_renderer_client.h"
36 #include "content/public/utility/content_utility_client.h" 36 #include "content/public/utility/content_utility_client.h"
37 #include "crypto/nss_util.h" 37 #include "crypto/nss_util.h"
38 #include "ipc/ipc_switches.h" 38 #include "ipc/ipc_switches.h"
39 #include "media/base/media.h" 39 #include "media/base/media.h"
40 #include "sandbox/src/sandbox_types.h" 40 #include "sandbox/win/src/sandbox_types.h"
41 #include "ui/base/ui_base_switches.h" 41 #include "ui/base/ui_base_switches.h"
42 #include "ui/base/ui_base_paths.h" 42 #include "ui/base/ui_base_paths.h"
43 #include "ui/base/win/dpi.h" 43 #include "ui/base/win/dpi.h"
44 #include "webkit/glue/webkit_glue.h" 44 #include "webkit/glue/webkit_glue.h"
45 45
46 #if defined(USE_TCMALLOC) 46 #if defined(USE_TCMALLOC)
47 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" 47 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
48 #endif 48 #endif
49 49
50 #if defined(OS_WIN) 50 #if defined(OS_WIN)
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 685
686 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 686 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
687 }; 687 };
688 688
689 // static 689 // static
690 ContentMainRunner* ContentMainRunner::Create() { 690 ContentMainRunner* ContentMainRunner::Create() {
691 return new ContentMainRunnerImpl(); 691 return new ContentMainRunnerImpl();
692 } 692 }
693 693
694 } // namespace content 694 } // namespace content
OLDNEW
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/app/startup_helper_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698