Chromium Code Reviews| 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 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1356 return TryChromeDialogView::NOT_NOW; | 1356 return TryChromeDialogView::NOT_NOW; |
| 1357 } | 1357 } |
| 1358 int try_chrome_int; | 1358 int try_chrome_int; |
| 1359 base::StringToInt(try_chrome, &try_chrome_int); | 1359 base::StringToInt(try_chrome, &try_chrome_int); |
| 1360 TryChromeDialogView::Result answer = | 1360 TryChromeDialogView::Result answer = |
| 1361 TryChromeDialogView::Show(try_chrome_int, process_singleton_.get()); | 1361 TryChromeDialogView::Show(try_chrome_int, process_singleton_.get()); |
| 1362 if (answer == TryChromeDialogView::NOT_NOW) | 1362 if (answer == TryChromeDialogView::NOT_NOW) |
| 1363 return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL; | 1363 return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL; |
| 1364 if (answer == TryChromeDialogView::UNINSTALL_CHROME) | 1364 if (answer == TryChromeDialogView::UNINSTALL_CHROME) |
| 1365 return chrome::RESULT_CODE_NORMAL_EXIT_EXP2; | 1365 return chrome::RESULT_CODE_NORMAL_EXIT_EXP2; |
| 1366 // At this point the user is willing to try chrome again. | |
| 1367 if (answer == TryChromeDialogView::TRY_CHROME_AS_DEFAULT) | |
| 1368 ShellIntegration::SetAsDefaultBrowser(); | |
|
grt (UTC plus 2)
2012/08/02 08:41:10
if you want the Greg dialog to appear on Win8, thi
cpu_(ooo_6.6-7.5)
2012/08/02 23:25:20
Good to know. No, I don't want the win8 case.
I w
| |
| 1366 #else | 1369 #else |
| 1367 // We don't support retention experiments on Mac or Linux. | 1370 // We don't support retention experiments on Mac or Linux. |
| 1368 return content::RESULT_CODE_NORMAL_EXIT; | 1371 return content::RESULT_CODE_NORMAL_EXIT; |
| 1369 #endif // defined(OS_WIN) | 1372 #endif // defined(OS_WIN) |
| 1370 } | 1373 } |
| 1371 | 1374 |
| 1372 // On first run, we need to process the predictor preferences before the | 1375 // On first run, we need to process the predictor preferences before the |
| 1373 // browser's profile_manager object is created, but after ResourceBundle | 1376 // browser's profile_manager object is created, but after ResourceBundle |
| 1374 // is initialized. | 1377 // is initialized. |
| 1375 first_run_ui_bypass_ = false; // True to skip first run UI. | 1378 first_run_ui_bypass_ = false; // True to skip first run UI. |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2080 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2083 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 2081 uma_name += "_XP"; | 2084 uma_name += "_XP"; |
| 2082 | 2085 |
| 2083 uma_name += "_PreRead_"; | 2086 uma_name += "_PreRead_"; |
| 2084 uma_name += pre_read_percentage; | 2087 uma_name += pre_read_percentage; |
| 2085 AddPreReadHistogramTime(uma_name.c_str(), time); | 2088 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 2086 } | 2089 } |
| 2087 #endif | 2090 #endif |
| 2088 #endif | 2091 #endif |
| 2089 } | 2092 } |
| OLD | NEW |