| OLD | NEW |
| 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/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 #if defined(OS_CHROMEOS) | 73 #if defined(OS_CHROMEOS) |
| 74 #include "base/sys_info.h" | 74 #include "base/sys_info.h" |
| 75 #include "chrome/browser/chromeos/boot_times_loader.h" | 75 #include "chrome/browser/chromeos/boot_times_loader.h" |
| 76 #endif | 76 #endif |
| 77 | 77 |
| 78 #if defined(OS_ANDROID) | 78 #if defined(OS_ANDROID) |
| 79 #include "chrome/common/descriptors_android.h" | 79 #include "chrome/common/descriptors_android.h" |
| 80 #endif | 80 #endif |
| 81 | 81 |
| 82 #if defined(TOOLKIT_GTK) | |
| 83 #include <gdk/gdk.h> | |
| 84 #include <glib.h> | |
| 85 #include <gtk/gtk.h> | |
| 86 #endif | |
| 87 | |
| 88 #if defined(USE_X11) | 82 #if defined(USE_X11) |
| 89 #include <stdlib.h> | 83 #include <stdlib.h> |
| 90 #include <string.h> | 84 #include <string.h> |
| 91 #include "ui/base/x/x11_util.h" | 85 #include "ui/base/x/x11_util.h" |
| 92 #endif | 86 #endif |
| 93 | 87 |
| 94 #if defined(USE_LINUX_BREAKPAD) | 88 #if defined(USE_LINUX_BREAKPAD) |
| 95 #include "chrome/app/breakpad_linux.h" | 89 #include "chrome/app/breakpad_linux.h" |
| 96 #endif | 90 #endif |
| 97 | 91 |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 | 768 |
| 775 content::ContentRendererClient* | 769 content::ContentRendererClient* |
| 776 ChromeMainDelegate::CreateContentRendererClient() { | 770 ChromeMainDelegate::CreateContentRendererClient() { |
| 777 return &g_chrome_content_renderer_client.Get(); | 771 return &g_chrome_content_renderer_client.Get(); |
| 778 } | 772 } |
| 779 | 773 |
| 780 content::ContentUtilityClient* | 774 content::ContentUtilityClient* |
| 781 ChromeMainDelegate::CreateContentUtilityClient() { | 775 ChromeMainDelegate::CreateContentUtilityClient() { |
| 782 return &g_chrome_content_utility_client.Get(); | 776 return &g_chrome_content_utility_client.Get(); |
| 783 } | 777 } |
| OLD | NEW |