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

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

Powered by Google App Engine
This is Rietveld 408576698