| 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 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 "directory. This means that running multiple instances " | 1232 "directory. This means that running multiple instances " |
| 1233 "would start multiple browser processes rather than " | 1233 "would start multiple browser processes rather than " |
| 1234 "opening a new window in the existing process. Aborting " | 1234 "opening a new window in the existing process. Aborting " |
| 1235 "now to avoid profile corruption."; | 1235 "now to avoid profile corruption."; |
| 1236 return chrome::RESULT_CODE_PROFILE_IN_USE; | 1236 return chrome::RESULT_CODE_PROFILE_IN_USE; |
| 1237 | 1237 |
| 1238 default: | 1238 default: |
| 1239 NOTREACHED(); | 1239 NOTREACHED(); |
| 1240 } | 1240 } |
| 1241 } | 1241 } |
| 1242 |
| 1243 first_run::CreateSentinelIfNeeded(); |
| 1242 #endif // !defined(OS_ANDROID) | 1244 #endif // !defined(OS_ANDROID) |
| 1243 | 1245 |
| 1244 // Desktop construction occurs here, (required before profile creation). | 1246 // Desktop construction occurs here, (required before profile creation). |
| 1245 PreProfileInit(); | 1247 PreProfileInit(); |
| 1246 | 1248 |
| 1247 std::string try_chrome = | 1249 std::string try_chrome = |
| 1248 parsed_command_line().GetSwitchValueASCII(switches::kTryChromeAgain); | 1250 parsed_command_line().GetSwitchValueASCII(switches::kTryChromeAgain); |
| 1249 if (!try_chrome.empty()) { | 1251 if (!try_chrome.empty()) { |
| 1250 #if defined(OS_WIN) | 1252 #if defined(OS_WIN) |
| 1251 // Setup.exe has determined that we need to run a retention experiment | 1253 // Setup.exe has determined that we need to run a retention experiment |
| (...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1701 chromeos::CrosSettings::Shutdown(); | 1703 chromeos::CrosSettings::Shutdown(); |
| 1702 #endif | 1704 #endif |
| 1703 #endif | 1705 #endif |
| 1704 } | 1706 } |
| 1705 | 1707 |
| 1706 // Public members: | 1708 // Public members: |
| 1707 | 1709 |
| 1708 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1710 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1709 chrome_extra_parts_.push_back(parts); | 1711 chrome_extra_parts_.push_back(parts); |
| 1710 } | 1712 } |
| OLD | NEW |