| 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 <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 #include "ui/aura/env.h" | 218 #include "ui/aura/env.h" |
| 219 #endif | 219 #endif |
| 220 | 220 |
| 221 using content::BrowserThread; | 221 using content::BrowserThread; |
| 222 | 222 |
| 223 namespace { | 223 namespace { |
| 224 | 224 |
| 225 // This function provides some ways to test crash and assertion handling | 225 // This function provides some ways to test crash and assertion handling |
| 226 // behavior of the program. | 226 // behavior of the program. |
| 227 void HandleTestParameters(const base::CommandLine& command_line) { | 227 void HandleTestParameters(const base::CommandLine& command_line) { |
| 228 // This parameter causes an assertion. | |
| 229 if (command_line.HasSwitch(switches::kBrowserAssertTest)) { | |
| 230 DCHECK(false); | |
| 231 } | |
| 232 | |
| 233 // This parameter causes a null pointer crash (crash reporter trigger). | 228 // This parameter causes a null pointer crash (crash reporter trigger). |
| 234 if (command_line.HasSwitch(switches::kBrowserCrashTest)) { | 229 if (command_line.HasSwitch(switches::kBrowserCrashTest)) { |
| 235 int* bad_pointer = NULL; | 230 int* bad_pointer = NULL; |
| 236 *bad_pointer = 0; | 231 *bad_pointer = 0; |
| 237 } | 232 } |
| 238 } | 233 } |
| 239 | 234 |
| 240 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 235 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 241 void AddFirstRunNewTabs(StartupBrowserCreator* browser_creator, | 236 void AddFirstRunNewTabs(StartupBrowserCreator* browser_creator, |
| 242 const std::vector<GURL>& new_tabs) { | 237 const std::vector<GURL>& new_tabs) { |
| (...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1715 chromeos::CrosSettings::Shutdown(); | 1710 chromeos::CrosSettings::Shutdown(); |
| 1716 #endif | 1711 #endif |
| 1717 #endif | 1712 #endif |
| 1718 } | 1713 } |
| 1719 | 1714 |
| 1720 // Public members: | 1715 // Public members: |
| 1721 | 1716 |
| 1722 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1717 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1723 chrome_extra_parts_.push_back(parts); | 1718 chrome_extra_parts_.push_back(parts); |
| 1724 } | 1719 } |
| OLD | NEW |