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

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

Issue 8265005: first run bubble using the views/bubble api. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: update chrome_tests.gypi 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 | « no previous file | chrome/browser/ui/views/first_run_bubble.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 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 // so it's better to fail here than fail mysteriously elsewhere. 1197 // so it's better to fail here than fail mysteriously elsewhere.
1198 CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) 1198 CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
1199 << "Must be able to get user data directory!"; 1199 << "Must be able to get user data directory!";
1200 #endif 1200 #endif
1201 1201
1202 process_singleton_.reset(new ProcessSingleton(user_data_dir)); 1202 process_singleton_.reset(new ProcessSingleton(user_data_dir));
1203 1203
1204 bool is_first_run = FirstRun::IsChromeFirstRun() || 1204 bool is_first_run = FirstRun::IsChromeFirstRun() ||
1205 parsed_command_line().HasSwitch(switches::kFirstRun); 1205 parsed_command_line().HasSwitch(switches::kFirstRun);
1206 1206
1207 #if defined(USE_AURA)
1208 // No first run on Aura. See crbug.com/99439.
1209 is_first_run = false;
1210 #endif
1211
1212 if (parsed_command_line().HasSwitch(switches::kImport) || 1207 if (parsed_command_line().HasSwitch(switches::kImport) ||
1213 parsed_command_line().HasSwitch(switches::kImportFromFile)) { 1208 parsed_command_line().HasSwitch(switches::kImportFromFile)) {
1214 // We use different BrowserProcess when importing so no GoogleURLTracker is 1209 // We use different BrowserProcess when importing so no GoogleURLTracker is
1215 // instantiated (as it makes a net::URLRequest and we don't have an IO 1210 // instantiated (as it makes a net::URLRequest and we don't have an IO
1216 // thread, see bug #1292702). 1211 // thread, see bug #1292702).
1217 browser_process_.reset(new FirstRunBrowserProcess(parsed_command_line())); 1212 browser_process_.reset(new FirstRunBrowserProcess(parsed_command_line()));
1218 is_first_run = false; 1213 is_first_run = false;
1219 } else { 1214 } else {
1220 browser_process_.reset(new BrowserProcessImpl(parsed_command_line())); 1215 browser_process_.reset(new BrowserProcessImpl(parsed_command_line()));
1221 } 1216 }
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
2086 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2081 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2087 (pre_read == "0" || pre_read == "1")) { 2082 (pre_read == "0" || pre_read == "1")) {
2088 std::string uma_name(name); 2083 std::string uma_name(name);
2089 uma_name += "_PreRead"; 2084 uma_name += "_PreRead";
2090 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2085 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2091 AddPreReadHistogramTime(uma_name.c_str(), time); 2086 AddPreReadHistogramTime(uma_name.c_str(), time);
2092 } 2087 }
2093 #endif 2088 #endif
2094 #endif 2089 #endif
2095 } 2090 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/first_run_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698