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

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: Android build fix Created 7 years, 6 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "grit/chromium_strings.h" 56 #include "grit/chromium_strings.h"
57 #include "ui/base/l10n/l10n_util_mac.h" 57 #include "ui/base/l10n/l10n_util_mac.h"
58 #endif 58 #endif
59 59
60 #if defined(OS_POSIX) 60 #if defined(OS_POSIX)
61 #include <locale.h> 61 #include <locale.h>
62 #include <signal.h> 62 #include <signal.h>
63 #endif 63 #endif
64 64
65 #if defined(OS_POSIX) && !defined(OS_MACOSX) 65 #if defined(OS_POSIX) && !defined(OS_MACOSX)
66 #include "chrome/app/nacl_fork_delegate_linux.h" 66 #include "components/nacl/common/nacl_fork_delegate_linux.h"
67 #endif 67 #endif
68 68
69 #if defined(OS_CHROMEOS) 69 #if defined(OS_CHROMEOS)
70 #include "base/sys_info.h" 70 #include "base/sys_info.h"
71 #include "chrome/browser/chromeos/boot_times_loader.h" 71 #include "chrome/browser/chromeos/boot_times_loader.h"
72 #include "chromeos/chromeos_paths.h" 72 #include "chromeos/chromeos_paths.h"
73 #endif 73 #endif
74 74
75 #if defined(OS_ANDROID) 75 #if defined(OS_ANDROID)
76 #include "chrome/common/descriptors_android.h" 76 #include "chrome/common/descriptors_android.h"
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 713
714 content::ContentRendererClient* 714 content::ContentRendererClient*
715 ChromeMainDelegate::CreateContentRendererClient() { 715 ChromeMainDelegate::CreateContentRendererClient() {
716 return &g_chrome_content_renderer_client.Get(); 716 return &g_chrome_content_renderer_client.Get();
717 } 717 }
718 718
719 content::ContentUtilityClient* 719 content::ContentUtilityClient*
720 ChromeMainDelegate::CreateContentUtilityClient() { 720 ChromeMainDelegate::CreateContentUtilityClient() {
721 return &g_chrome_content_utility_client.Get(); 721 return &g_chrome_content_utility_client.Get();
722 } 722 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698