| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/browser_init.h" | 5 #include "chrome/browser/ui/browser_init.h" |
| 6 | 6 |
| 7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 #include "chrome/common/chrome_paths.h" | 68 #include "chrome/common/chrome_paths.h" |
| 69 #include "chrome/common/chrome_result_codes.h" | 69 #include "chrome/common/chrome_result_codes.h" |
| 70 #include "chrome/common/chrome_switches.h" | 70 #include "chrome/common/chrome_switches.h" |
| 71 #include "chrome/common/chrome_version_info.h" | 71 #include "chrome/common/chrome_version_info.h" |
| 72 #include "chrome/common/extensions/extension_constants.h" | 72 #include "chrome/common/extensions/extension_constants.h" |
| 73 #include "chrome/common/pref_names.h" | 73 #include "chrome/common/pref_names.h" |
| 74 #include "chrome/common/url_constants.h" | 74 #include "chrome/common/url_constants.h" |
| 75 #include "chrome/installer/util/browser_distribution.h" | 75 #include "chrome/installer/util/browser_distribution.h" |
| 76 #include "content/browser/child_process_security_policy.h" | 76 #include "content/browser/child_process_security_policy.h" |
| 77 #include "content/browser/tab_contents/navigation_details.h" | 77 #include "content/browser/tab_contents/navigation_details.h" |
| 78 #include "content/browser/tab_contents/tab_contents.h" |
| 78 #include "content/browser/tab_contents/tab_contents_view.h" | 79 #include "content/browser/tab_contents/tab_contents_view.h" |
| 79 #include "content/public/browser/browser_thread.h" | 80 #include "content/public/browser/browser_thread.h" |
| 80 #include "grit/chromium_strings.h" | 81 #include "grit/chromium_strings.h" |
| 81 #include "grit/generated_resources.h" | 82 #include "grit/generated_resources.h" |
| 82 #include "grit/locale_settings.h" | 83 #include "grit/locale_settings.h" |
| 83 #include "grit/theme_resources.h" | 84 #include "grit/theme_resources.h" |
| 84 #include "grit/theme_resources_standard.h" | 85 #include "grit/theme_resources_standard.h" |
| 85 #include "net/base/net_util.h" | 86 #include "net/base/net_util.h" |
| 86 #include "ui/base/l10n/l10n_util.h" | 87 #include "ui/base/l10n/l10n_util.h" |
| 87 #include "ui/base/resource/resource_bundle.h" | 88 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 | 1525 |
| 1525 Profile* profile = ProfileManager::GetLastUsedProfile(); | 1526 Profile* profile = ProfileManager::GetLastUsedProfile(); |
| 1526 if (!profile) { | 1527 if (!profile) { |
| 1527 // We should only be able to get here if the profile already exists and | 1528 // We should only be able to get here if the profile already exists and |
| 1528 // has been created. | 1529 // has been created. |
| 1529 NOTREACHED(); | 1530 NOTREACHED(); |
| 1530 return; | 1531 return; |
| 1531 } | 1532 } |
| 1532 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); | 1533 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL); |
| 1533 } | 1534 } |
| OLD | NEW |