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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 8686014: Remove child_process.h includes from chrome (specifically WaitForDebugger). I moved the browser p... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/common/chrome_switches.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "chrome/common/chrome_version_info.h" 86 #include "chrome/common/chrome_version_info.h"
87 #include "chrome/common/env_vars.h" 87 #include "chrome/common/env_vars.h"
88 #include "chrome/common/json_pref_store.h" 88 #include "chrome/common/json_pref_store.h"
89 #include "chrome/common/jstemplate_builder.h" 89 #include "chrome/common/jstemplate_builder.h"
90 #include "chrome/common/logging_chrome.h" 90 #include "chrome/common/logging_chrome.h"
91 #include "chrome/common/net/net_resource_provider.h" 91 #include "chrome/common/net/net_resource_provider.h"
92 #include "chrome/common/pref_names.h" 92 #include "chrome/common/pref_names.h"
93 #include "chrome/common/profiling.h" 93 #include "chrome/common/profiling.h"
94 #include "chrome/installer/util/google_update_settings.h" 94 #include "chrome/installer/util/google_update_settings.h"
95 #include "content/browser/renderer_host/resource_dispatcher_host.h" 95 #include "content/browser/renderer_host/resource_dispatcher_host.h"
96 #include "content/common/child_process.h"
97 #include "content/public/browser/browser_thread.h" 96 #include "content/public/browser/browser_thread.h"
98 #include "content/public/common/content_client.h" 97 #include "content/public/common/content_client.h"
99 #include "content/public/common/main_function_params.h" 98 #include "content/public/common/main_function_params.h"
100 #include "grit/app_locale_settings.h" 99 #include "grit/app_locale_settings.h"
101 #include "grit/chromium_strings.h" 100 #include "grit/chromium_strings.h"
102 #include "grit/generated_resources.h" 101 #include "grit/generated_resources.h"
103 #include "grit/platform_locale_settings.h" 102 #include "grit/platform_locale_settings.h"
104 #include "net/base/cookie_monster.h" 103 #include "net/base/cookie_monster.h"
105 #include "net/base/net_module.h" 104 #include "net/base/net_module.h"
106 #include "net/base/sdch_manager.h" 105 #include "net/base/sdch_manager.h"
(...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after
1852 1851
1853 // Start watching for a hang. 1852 // Start watching for a hang.
1854 MetricsService::LogNeedForCleanShutdown(); 1853 MetricsService::LogNeedForCleanShutdown();
1855 1854
1856 #if defined(OS_WIN) 1855 #if defined(OS_WIN)
1857 // We check this here because if the profile is OTR (chromeos possibility) 1856 // We check this here because if the profile is OTR (chromeos possibility)
1858 // it won't still be accessible after browser is destroyed. 1857 // it won't still be accessible after browser is destroyed.
1859 record_search_engine_ = is_first_run_ && !profile_->IsOffTheRecord(); 1858 record_search_engine_ = is_first_run_ && !profile_->IsOffTheRecord();
1860 #endif 1859 #endif
1861 1860
1862 // ChildProcess:: is a misnomer unless you consider context. Use
1863 // of --wait-for-debugger only makes sense when Chrome itself is a
1864 // child process (e.g. when launched by PyAuto).
1865 if (parsed_command_line().HasSwitch(switches::kWaitForDebugger)) {
1866 ChildProcess::WaitForDebugger("Browser");
1867 }
1868
1869 #if defined(OS_CHROMEOS) 1861 #if defined(OS_CHROMEOS)
1870 // Wait until here to start the out-of-memory priority manager so that 1862 // Wait until here to start the out-of-memory priority manager so that
1871 // we give the most amount of time for the other services to start up 1863 // we give the most amount of time for the other services to start up
1872 // before we start adjusting the oom priority. 1864 // before we start adjusting the oom priority.
1873 g_browser_process->oom_priority_manager()->Start(); 1865 g_browser_process->oom_priority_manager()->Start();
1874 #endif 1866 #endif
1875 1867
1876 // Create the instance of the cloud print proxy service so that it can launch 1868 // Create the instance of the cloud print proxy service so that it can launch
1877 // the service process if needed. This is needed because the service process 1869 // the service process if needed. This is needed because the service process
1878 // might have shutdown because an update was available. 1870 // might have shutdown because an update was available.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
2140 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2132 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2141 (pre_read == "0" || pre_read == "1")) { 2133 (pre_read == "0" || pre_read == "1")) {
2142 std::string uma_name(name); 2134 std::string uma_name(name);
2143 uma_name += "_PreRead"; 2135 uma_name += "_PreRead";
2144 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2136 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2145 AddPreReadHistogramTime(uma_name.c_str(), time); 2137 AddPreReadHistogramTime(uma_name.c_str(), time);
2146 } 2138 }
2147 #endif 2139 #endif
2148 #endif 2140 #endif
2149 } 2141 }
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698