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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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/character_encoding.cc ('k') | chrome/browser/chrome_browser_main_posix.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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 #if defined(USE_X11) 201 #if defined(USE_X11)
202 #include "chrome/browser/chrome_browser_main_x11.h" 202 #include "chrome/browser/chrome_browser_main_x11.h"
203 #endif 203 #endif
204 204
205 #if defined(USE_AURA) 205 #if defined(USE_AURA)
206 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 206 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
207 #include "ui/aura/desktop.h" 207 #include "ui/aura/desktop.h"
208 #include "ui/aura_shell/shell.h" 208 #include "ui/aura_shell/shell.h"
209 #endif 209 #endif
210 210
211 using content::BrowserThread;
212
211 namespace net { 213 namespace net {
212 class NetLog; 214 class NetLog;
213 } // namespace net 215 } // namespace net
214 216
215 namespace { 217 namespace {
216 218
217 // This function provides some ways to test crash and assertion handling 219 // This function provides some ways to test crash and assertion handling
218 // behavior of the program. 220 // behavior of the program.
219 void HandleTestParameters(const CommandLine& command_line) { 221 void HandleTestParameters(const CommandLine& command_line) {
220 // This parameter causes an assertion. 222 // This parameter causes an assertion.
(...skipping 1906 matching lines...) Expand 10 before | Expand all | Expand 10 after
2127 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2129 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2128 (pre_read == "0" || pre_read == "1")) { 2130 (pre_read == "0" || pre_read == "1")) {
2129 std::string uma_name(name); 2131 std::string uma_name(name);
2130 uma_name += "_PreRead"; 2132 uma_name += "_PreRead";
2131 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2133 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2132 AddPreReadHistogramTime(uma_name.c_str(), time); 2134 AddPreReadHistogramTime(uma_name.c_str(), time);
2133 } 2135 }
2134 #endif 2136 #endif
2135 #endif 2137 #endif
2136 } 2138 }
OLDNEW
« no previous file with comments | « chrome/browser/character_encoding.cc ('k') | chrome/browser/chrome_browser_main_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698