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

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

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Still a few linking errors to resolve. Created 9 years, 3 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) 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #include "chrome/browser/oom_priority_manager.h" 144 #include "chrome/browser/oom_priority_manager.h"
145 #include "chrome/browser/ui/views/browser_dialogs.h" 145 #include "chrome/browser/ui/views/browser_dialogs.h"
146 #endif 146 #endif
147 147
148 // TODO(port): several win-only methods have been pulled out of this, but 148 // TODO(port): several win-only methods have been pulled out of this, but
149 // BrowserMain() as a whole needs to be broken apart so that it's usable by 149 // BrowserMain() as a whole needs to be broken apart so that it's usable by
150 // other platforms. For now, it's just a stub. This is a serious work in 150 // other platforms. For now, it's just a stub. This is a serious work in
151 // progress and should not be taken as an indication of a real refactoring. 151 // progress and should not be taken as an indication of a real refactoring.
152 152
153 #if defined(OS_WIN) 153 #if defined(OS_WIN)
154
155 #include "base/environment.h" // For PreRead experiment. 154 #include "base/environment.h" // For PreRead experiment.
156 #include "base/win/windows_version.h" 155 #include "base/win/windows_version.h"
157 #include "chrome/browser/browser_trial.h" 156 #include "chrome/browser/browser_trial.h"
158 #include "chrome/browser/browser_util_win.h" 157 #include "chrome/browser/browser_util_win.h"
159 #include "chrome/browser/first_run/try_chrome_dialog_view.h" 158 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
160 #include "chrome/browser/first_run/upgrade_util_win.h" 159 #include "chrome/browser/first_run/upgrade_util_win.h"
161 #include "chrome/browser/net/url_fixer_upper.h" 160 #include "chrome/browser/net/url_fixer_upper.h"
162 #include "chrome/browser/rlz/rlz.h" 161 #include "chrome/browser/rlz/rlz.h"
163 #include "chrome/browser/ui/views/user_data_dir_dialog.h" 162 #include "chrome/browser/ui/views/user_data_dir_dialog.h"
164 #include "chrome/installer/util/helper.h" 163 #include "chrome/installer/util/helper.h"
(...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after
2038 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2037 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2039 (pre_read == "0" || pre_read == "1")) { 2038 (pre_read == "0" || pre_read == "1")) {
2040 std::string uma_name(name); 2039 std::string uma_name(name);
2041 uma_name += "_PreRead"; 2040 uma_name += "_PreRead";
2042 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2041 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2043 AddPreReadHistogramTime(uma_name.c_str(), time); 2042 AddPreReadHistogramTime(uma_name.c_str(), time);
2044 } 2043 }
2045 #endif 2044 #endif
2046 #endif 2045 #endif
2047 } 2046 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698