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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create a zygote folder Created 7 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
« no previous file with comments | « no previous file | chrome/app/nacl_fork_delegate_linux.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 #include "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/metrics/stats_counters.h" 10 #include "base/metrics/stats_counters.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "grit/chromium_strings.h" 57 #include "grit/chromium_strings.h"
58 #include "ui/base/l10n/l10n_util_mac.h" 58 #include "ui/base/l10n/l10n_util_mac.h"
59 #endif 59 #endif
60 60
61 #if defined(OS_POSIX) 61 #if defined(OS_POSIX)
62 #include <locale.h> 62 #include <locale.h>
63 #include <signal.h> 63 #include <signal.h>
64 #endif 64 #endif
65 65
66 #if !defined(DISABLE_NACL) && defined(OS_LINUX) 66 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
67 #include "chrome/app/nacl_fork_delegate_linux.h" 67 #include "components/nacl/common/nacl_fork_delegate_linux.h"
68 #include "chrome/common/nacl_paths.h" 68 #include "components/nacl/common/nacl_paths.h"
69 #endif 69 #endif
70 70
71 #if defined(OS_CHROMEOS) 71 #if defined(OS_CHROMEOS)
72 #include "base/sys_info.h" 72 #include "base/sys_info.h"
73 #include "chrome/browser/chromeos/boot_times_loader.h" 73 #include "chrome/browser/chromeos/boot_times_loader.h"
74 #include "chromeos/chromeos_paths.h" 74 #include "chromeos/chromeos_paths.h"
75 #endif 75 #endif
76 76
77 #if defined(OS_ANDROID) 77 #if defined(OS_ANDROID)
78 #include "chrome/common/descriptors_android.h" 78 #include "chrome/common/descriptors_android.h"
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 726
727 content::ContentRendererClient* 727 content::ContentRendererClient*
728 ChromeMainDelegate::CreateContentRendererClient() { 728 ChromeMainDelegate::CreateContentRendererClient() {
729 return &g_chrome_content_renderer_client.Get(); 729 return &g_chrome_content_renderer_client.Get();
730 } 730 }
731 731
732 content::ContentUtilityClient* 732 content::ContentUtilityClient*
733 ChromeMainDelegate::CreateContentUtilityClient() { 733 ChromeMainDelegate::CreateContentUtilityClient() {
734 return &g_chrome_content_utility_client.Get(); 734 return &g_chrome_content_utility_client.Get();
735 } 735 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/nacl_fork_delegate_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698