| 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 24 matching lines...) Expand all Loading... |
| 35 #include "ui/base/ui_base_switches.h" | 35 #include "ui/base/ui_base_switches.h" |
| 36 | 36 |
| 37 #if defined(OS_WIN) | 37 #if defined(OS_WIN) |
| 38 #include <algorithm> | 38 #include <algorithm> |
| 39 #include <atlbase.h> | 39 #include <atlbase.h> |
| 40 #include <malloc.h> | 40 #include <malloc.h> |
| 41 #include "base/string_util.h" | 41 #include "base/string_util.h" |
| 42 #include "base/win/registry.h" | 42 #include "base/win/registry.h" |
| 43 #include "chrome/browser/policy/policy_path_parser.h" | 43 #include "chrome/browser/policy/policy_path_parser.h" |
| 44 #include "policy/policy_constants.h" | 44 #include "policy/policy_constants.h" |
| 45 #include "sandbox/src/sandbox.h" | 45 #include "sandbox/win/src/sandbox.h" |
| 46 #include "tools/memory_watcher/memory_watcher.h" | 46 #include "tools/memory_watcher/memory_watcher.h" |
| 47 #include "ui/base/resource/resource_bundle_win.h" | 47 #include "ui/base/resource/resource_bundle_win.h" |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 #if defined(OS_MACOSX) | 50 #if defined(OS_MACOSX) |
| 51 #include "base/mac/mac_util.h" | 51 #include "base/mac/mac_util.h" |
| 52 #include "base/mac/os_crash_dumps.h" | 52 #include "base/mac/os_crash_dumps.h" |
| 53 #include "chrome/app/breakpad_mac.h" | 53 #include "chrome/app/breakpad_mac.h" |
| 54 #include "chrome/app/chrome_main_mac.h" | 54 #include "chrome/app/chrome_main_mac.h" |
| 55 #include "chrome/browser/mac/relauncher.h" | 55 #include "chrome/browser/mac/relauncher.h" |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 | 716 |
| 717 content::ContentRendererClient* | 717 content::ContentRendererClient* |
| 718 ChromeMainDelegate::CreateContentRendererClient() { | 718 ChromeMainDelegate::CreateContentRendererClient() { |
| 719 return &g_chrome_content_renderer_client.Get(); | 719 return &g_chrome_content_renderer_client.Get(); |
| 720 } | 720 } |
| 721 | 721 |
| 722 content::ContentUtilityClient* | 722 content::ContentUtilityClient* |
| 723 ChromeMainDelegate::CreateContentUtilityClient() { | 723 ChromeMainDelegate::CreateContentUtilityClient() { |
| 724 return &g_chrome_content_utility_client.Get(); | 724 return &g_chrome_content_utility_client.Get(); |
| 725 } | 725 } |
| OLD | NEW |