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

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

Issue 12662019: Split the ProcessType enum into process types that content knows about (which will remain in src\co… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 "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 15 matching lines...) Expand all
26 #include "chrome/common/chrome_version_info.h" 26 #include "chrome/common/chrome_version_info.h"
27 #include "chrome/common/logging_chrome.h" 27 #include "chrome/common/logging_chrome.h"
28 #include "chrome/common/profiling.h" 28 #include "chrome/common/profiling.h"
29 #include "chrome/common/startup_metric_utils.h" 29 #include "chrome/common/startup_metric_utils.h"
30 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "chrome/plugin/chrome_content_plugin_client.h" 31 #include "chrome/plugin/chrome_content_plugin_client.h"
32 #include "chrome/renderer/chrome_content_renderer_client.h" 32 #include "chrome/renderer/chrome_content_renderer_client.h"
33 #include "chrome/utility/chrome_content_utility_client.h" 33 #include "chrome/utility/chrome_content_utility_client.h"
34 #include "content/public/common/content_client.h" 34 #include "content/public/common/content_client.h"
35 #include "content/public/common/content_paths.h" 35 #include "content/public/common/content_paths.h"
36 #include "content/public/common/content_switches.h"
37 #include "ui/base/ui_base_switches.h" 36 #include "ui/base/ui_base_switches.h"
38 37
39 #if defined(OS_WIN) 38 #if defined(OS_WIN)
40 #include <algorithm> 39 #include <algorithm>
41 #include <atlbase.h> 40 #include <atlbase.h>
42 #include <malloc.h> 41 #include <malloc.h>
43 #include "base/string_util.h" 42 #include "base/string_util.h"
44 #include "sandbox/win/src/sandbox.h" 43 #include "sandbox/win/src/sandbox.h"
45 #include "tools/memory_watcher/memory_watcher.h" 44 #include "tools/memory_watcher/memory_watcher.h"
46 #include "ui/base/resource/resource_bundle_win.h" 45 #include "ui/base/resource/resource_bundle_win.h"
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 712
714 content::ContentRendererClient* 713 content::ContentRendererClient*
715 ChromeMainDelegate::CreateContentRendererClient() { 714 ChromeMainDelegate::CreateContentRendererClient() {
716 return &g_chrome_content_renderer_client.Get(); 715 return &g_chrome_content_renderer_client.Get();
717 } 716 }
718 717
719 content::ContentUtilityClient* 718 content::ContentUtilityClient*
720 ChromeMainDelegate::CreateContentUtilityClient() { 719 ChromeMainDelegate::CreateContentUtilityClient() {
721 return &g_chrome_content_utility_client.Get(); 720 return &g_chrome_content_utility_client.Get();
722 } 721 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/automation/automation_provider_observers.cc » ('j') | chrome/common/chrome_process_type.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698