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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 profile = GetStartupProfile(user_data_dir, parsed_command_line); | 441 profile = GetStartupProfile(user_data_dir, parsed_command_line); |
442 | 442 |
443 if (!profile && !profile_dir_specified) | 443 if (!profile && !profile_dir_specified) |
444 profile = GetFallbackStartupProfile(); | 444 profile = GetFallbackStartupProfile(); |
445 | 445 |
446 if (!profile) { | 446 if (!profile) { |
447 ProfileErrorType error_type = profile_dir_specified ? | 447 ProfileErrorType error_type = profile_dir_specified ? |
448 PROFILE_ERROR_CREATE_FAILURE_SPECIFIED : | 448 PROFILE_ERROR_CREATE_FAILURE_SPECIFIED : |
449 PROFILE_ERROR_CREATE_FAILURE_ALL; | 449 PROFILE_ERROR_CREATE_FAILURE_ALL; |
450 | 450 |
451 ShowProfileErrorDialog(error_type, IDS_COULDNT_STARTUP_PROFILE_ERROR); | 451 // TODO(lwchkg): What diagnostics do you want to include in the feedback |
| 452 // report when an error occurs? |
| 453 ShowProfileErrorDialog(error_type, IDS_COULDNT_STARTUP_PROFILE_ERROR, |
| 454 "Error creating primary profile."); |
452 return nullptr; | 455 return nullptr; |
453 } | 456 } |
454 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) | 457 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) |
455 | 458 |
456 UMA_HISTOGRAM_LONG_TIMES( | 459 UMA_HISTOGRAM_LONG_TIMES( |
457 "Startup.CreateFirstProfile", base::Time::Now() - start); | 460 "Startup.CreateFirstProfile", base::Time::Now() - start); |
458 return profile; | 461 return profile; |
459 } | 462 } |
460 | 463 |
461 #if defined(OS_MACOSX) | 464 #if defined(OS_MACOSX) |
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2068 chromeos::CrosSettings::Shutdown(); | 2071 chromeos::CrosSettings::Shutdown(); |
2069 #endif // defined(OS_CHROMEOS) | 2072 #endif // defined(OS_CHROMEOS) |
2070 #endif // defined(OS_ANDROID) | 2073 #endif // defined(OS_ANDROID) |
2071 } | 2074 } |
2072 | 2075 |
2073 // Public members: | 2076 // Public members: |
2074 | 2077 |
2075 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2078 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2076 chrome_extra_parts_.push_back(parts); | 2079 chrome_extra_parts_.push_back(parts); |
2077 } | 2080 } |
OLD | NEW |