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

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

Issue 8336007: Move content_client.h into content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add back a needed include. Created 9 years, 2 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/extensions/extension_host.cc » ('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/json_pref_store.h" 86 #include "chrome/common/json_pref_store.h"
87 #include "chrome/common/jstemplate_builder.h" 87 #include "chrome/common/jstemplate_builder.h"
88 #include "chrome/common/logging_chrome.h" 88 #include "chrome/common/logging_chrome.h"
89 #include "chrome/common/net/net_resource_provider.h" 89 #include "chrome/common/net/net_resource_provider.h"
90 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
91 #include "chrome/common/profiling.h" 91 #include "chrome/common/profiling.h"
92 #include "chrome/installer/util/google_update_settings.h" 92 #include "chrome/installer/util/google_update_settings.h"
93 #include "content/browser/browser_thread.h" 93 #include "content/browser/browser_thread.h"
94 #include "content/browser/renderer_host/resource_dispatcher_host.h" 94 #include "content/browser/renderer_host/resource_dispatcher_host.h"
95 #include "content/common/child_process.h" 95 #include "content/common/child_process.h"
96 #include "content/common/content_client.h"
97 #include "content/common/main_function_params.h" 96 #include "content/common/main_function_params.h"
97 #include "content/public/common/content_client.h"
98 #include "grit/app_locale_settings.h" 98 #include "grit/app_locale_settings.h"
99 #include "grit/chromium_strings.h" 99 #include "grit/chromium_strings.h"
100 #include "grit/generated_resources.h" 100 #include "grit/generated_resources.h"
101 #include "grit/platform_locale_settings.h" 101 #include "grit/platform_locale_settings.h"
102 #include "net/base/cookie_monster.h" 102 #include "net/base/cookie_monster.h"
103 #include "net/base/net_module.h" 103 #include "net/base/net_module.h"
104 #include "net/base/sdch_manager.h" 104 #include "net/base/sdch_manager.h"
105 #include "net/http/http_basic_stream.h" 105 #include "net/http/http_basic_stream.h"
106 #include "net/http/http_network_layer.h" 106 #include "net/http/http_network_layer.h"
107 #include "net/http/http_stream_factory.h" 107 #include "net/http/http_stream_factory.h"
(...skipping 1984 matching lines...) Expand 10 before | Expand all | Expand 10 after
2092 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2092 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2093 (pre_read == "0" || pre_read == "1")) { 2093 (pre_read == "0" || pre_read == "1")) {
2094 std::string uma_name(name); 2094 std::string uma_name(name);
2095 uma_name += "_PreRead"; 2095 uma_name += "_PreRead";
2096 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2096 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2097 AddPreReadHistogramTime(uma_name.c_str(), time); 2097 AddPreReadHistogramTime(uma_name.c_str(), time);
2098 } 2098 }
2099 #endif 2099 #endif
2100 #endif 2100 #endif
2101 } 2101 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/extensions/extension_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698