| 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 <algorithm> | 10 #include <algorithm> |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 // missing code in the above test. | 576 // missing code in the above test. |
| 577 CHECK(profile) << "Cannot get default profile."; | 577 CHECK(profile) << "Cannot get default profile."; |
| 578 | 578 |
| 579 #else | 579 #else |
| 580 profile = GetStartupProfile(user_data_dir, parsed_command_line); | 580 profile = GetStartupProfile(user_data_dir, parsed_command_line); |
| 581 | 581 |
| 582 if (!profile && !profile_dir_specified) | 582 if (!profile && !profile_dir_specified) |
| 583 profile = GetFallbackStartupProfile(); | 583 profile = GetFallbackStartupProfile(); |
| 584 | 584 |
| 585 if (!profile) { | 585 if (!profile) { |
| 586 ProfileErrorType error_type = profile_dir_specified ? | 586 ProfileErrorType error_type = |
| 587 PROFILE_ERROR_CREATE_FAILURE_SPECIFIED : | 587 profile_dir_specified ? ProfileErrorType::CREATE_FAILURE_SPECIFIED |
| 588 PROFILE_ERROR_CREATE_FAILURE_ALL; | 588 : ProfileErrorType::CREATE_FAILURE_ALL; |
| 589 | 589 |
| 590 // TODO(lwchkg): What diagnostics do you want to include in the feedback | 590 // TODO(lwchkg): What diagnostics do you want to include in the feedback |
| 591 // report when an error occurs? | 591 // report when an error occurs? |
| 592 ShowProfileErrorDialog(error_type, IDS_COULDNT_STARTUP_PROFILE_ERROR, | 592 ShowProfileErrorDialog(error_type, IDS_COULDNT_STARTUP_PROFILE_ERROR, |
| 593 "Error creating primary profile."); | 593 "Error creating primary profile."); |
| 594 return nullptr; | 594 return nullptr; |
| 595 } | 595 } |
| 596 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) | 596 #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) |
| 597 | 597 |
| 598 UMA_HISTOGRAM_LONG_TIMES( | 598 UMA_HISTOGRAM_LONG_TIMES( |
| (...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2228 chromeos::CrosSettings::Shutdown(); | 2228 chromeos::CrosSettings::Shutdown(); |
| 2229 #endif // defined(OS_CHROMEOS) | 2229 #endif // defined(OS_CHROMEOS) |
| 2230 #endif // defined(OS_ANDROID) | 2230 #endif // defined(OS_ANDROID) |
| 2231 } | 2231 } |
| 2232 | 2232 |
| 2233 // Public members: | 2233 // Public members: |
| 2234 | 2234 |
| 2235 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2235 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2236 chrome_extra_parts_.push_back(parts); | 2236 chrome_extra_parts_.push_back(parts); |
| 2237 } | 2237 } |
| OLD | NEW |