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

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

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
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 <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include "base/allocator/allocator_extension.h" 9 #include "base/allocator/allocator_extension.h"
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 24 matching lines...) Expand all
35 #include "content/public/common/content_switches.h" 35 #include "content/public/common/content_switches.h"
36 #include "content/public/common/main_function_params.h" 36 #include "content/public/common/main_function_params.h"
37 #include "content/public/common/sandbox_init.h" 37 #include "content/public/common/sandbox_init.h"
38 #include "crypto/nss_util.h" 38 #include "crypto/nss_util.h"
39 #include "ipc/ipc_switches.h" 39 #include "ipc/ipc_switches.h"
40 #include "media/base/media.h" 40 #include "media/base/media.h"
41 #include "sandbox/win/src/sandbox_types.h" 41 #include "sandbox/win/src/sandbox_types.h"
42 #include "ui/base/ui_base_paths.h" 42 #include "ui/base/ui_base_paths.h"
43 #include "ui/base/ui_base_switches.h" 43 #include "ui/base/ui_base_switches.h"
44 #include "ui/base/win/dpi.h" 44 #include "ui/base/win/dpi.h"
45 #include "webkit/user_agent/user_agent.h" 45 #include "webkit/common/user_agent/user_agent.h"
46 46
47 #if defined(USE_TCMALLOC) 47 #if defined(USE_TCMALLOC)
48 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" 48 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
49 #if defined(TYPE_PROFILING) 49 #if defined(TYPE_PROFILING)
50 #include "base/allocator/type_profiler.h" 50 #include "base/allocator/type_profiler.h"
51 #include "base/allocator/type_profiler_tcmalloc.h" 51 #include "base/allocator/type_profiler_tcmalloc.h"
52 #endif 52 #endif
53 #endif 53 #endif
54 54
55 #if !defined(OS_IOS) 55 #if !defined(OS_IOS)
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 814
815 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 815 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
816 }; 816 };
817 817
818 // static 818 // static
819 ContentMainRunner* ContentMainRunner::Create() { 819 ContentMainRunner* ContentMainRunner::Create() {
820 return new ContentMainRunnerImpl(); 820 return new ContentMainRunnerImpl();
821 } 821 }
822 822
823 } // namespace content 823 } // namespace content
OLDNEW
« no previous file with comments | « chrome_frame/test/html_util_unittests.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698