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/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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 #include "content/public/browser/render_process_host.h" | 101 #include "content/public/browser/render_process_host.h" |
102 #include "content/public/common/content_client.h" | 102 #include "content/public/common/content_client.h" |
103 #include "content/public/common/main_function_params.h" | 103 #include "content/public/common/main_function_params.h" |
104 #include "grit/app_locale_settings.h" | 104 #include "grit/app_locale_settings.h" |
105 #include "grit/browser_resources.h" | 105 #include "grit/browser_resources.h" |
106 #include "grit/chromium_strings.h" | 106 #include "grit/chromium_strings.h" |
107 #include "grit/generated_resources.h" | 107 #include "grit/generated_resources.h" |
108 #include "grit/platform_locale_settings.h" | 108 #include "grit/platform_locale_settings.h" |
109 #include "net/base/net_module.h" | 109 #include "net/base/net_module.h" |
110 #include "net/base/sdch_manager.h" | 110 #include "net/base/sdch_manager.h" |
111 #include "net/base/ssl_config_service.h" | |
112 #include "net/cookies/cookie_monster.h" | 111 #include "net/cookies/cookie_monster.h" |
113 #include "net/http/http_stream_factory.h" | 112 #include "net/http/http_stream_factory.h" |
114 #include "net/spdy/spdy_session.h" | 113 #include "net/spdy/spdy_session.h" |
115 #include "net/spdy/spdy_session_pool.h" | 114 #include "net/spdy/spdy_session_pool.h" |
116 #include "net/url_request/url_request.h" | 115 #include "net/url_request/url_request.h" |
117 #include "net/websockets/websocket_job.h" | 116 #include "net/websockets/websocket_job.h" |
118 #include "ui/base/l10n/l10n_util.h" | 117 #include "ui/base/l10n/l10n_util.h" |
119 #include "ui/base/layout.h" | 118 #include "ui/base/layout.h" |
120 #include "ui/base/resource/resource_bundle.h" | 119 #include "ui/base/resource/resource_bundle.h" |
121 #include "ui/base/resource/resource_handle.h" | 120 #include "ui/base/resource/resource_handle.h" |
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1553 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1552 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1554 uma_name += "_XP"; | 1553 uma_name += "_XP"; |
1555 | 1554 |
1556 uma_name += "_PreRead_"; | 1555 uma_name += "_PreRead_"; |
1557 uma_name += pre_read_percentage; | 1556 uma_name += pre_read_percentage; |
1558 AddPreReadHistogramTime(uma_name.c_str(), time); | 1557 AddPreReadHistogramTime(uma_name.c_str(), time); |
1559 } | 1558 } |
1560 #endif | 1559 #endif |
1561 #endif | 1560 #endif |
1562 } | 1561 } |
OLD | NEW |