| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) | 775 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) |
| 776 browser->ToggleFullscreenMode(); | 776 browser->ToggleFullscreenMode(); |
| 777 #endif | 777 #endif |
| 778 | 778 |
| 779 bool first_tab = true; | 779 bool first_tab = true; |
| 780 for (size_t i = 0; i < tabs.size(); ++i) { | 780 for (size_t i = 0; i < tabs.size(); ++i) { |
| 781 // We skip URLs that we'd have to launch an external protocol handler for. | 781 // We skip URLs that we'd have to launch an external protocol handler for. |
| 782 // This avoids us getting into an infinite loop asking ourselves to open | 782 // This avoids us getting into an infinite loop asking ourselves to open |
| 783 // a URL, should the handler be (incorrectly) configured to be us. Anyone | 783 // a URL, should the handler be (incorrectly) configured to be us. Anyone |
| 784 // asking us to open such a URL should really ask the handler directly. | 784 // asking us to open such a URL should really ask the handler directly. |
| 785 if (!process_startup && !URLRequest::IsHandledURL(tabs[i].url)) | 785 if (!process_startup && !net::URLRequest::IsHandledURL(tabs[i].url)) |
| 786 continue; | 786 continue; |
| 787 | 787 |
| 788 int add_types = first_tab ? TabStripModel::ADD_SELECTED : | 788 int add_types = first_tab ? TabStripModel::ADD_SELECTED : |
| 789 TabStripModel::ADD_NONE; | 789 TabStripModel::ADD_NONE; |
| 790 add_types |= TabStripModel::ADD_FORCE_INDEX; | 790 add_types |= TabStripModel::ADD_FORCE_INDEX; |
| 791 if (tabs[i].is_pinned) | 791 if (tabs[i].is_pinned) |
| 792 add_types |= TabStripModel::ADD_PINNED; | 792 add_types |= TabStripModel::ADD_PINNED; |
| 793 int index = browser->GetIndexForInsertionDuringRestore(i); | 793 int index = browser->GetIndexForInsertionDuringRestore(i); |
| 794 | 794 |
| 795 browser::NavigateParams params(browser, tabs[i].url, | 795 browser::NavigateParams params(browser, tabs[i].url, |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1086 return false; | 1086 return false; |
| 1087 automation->SetExpectedTabCount(expected_tabs); | 1087 automation->SetExpectedTabCount(expected_tabs); |
| 1088 | 1088 |
| 1089 AutomationProviderList* list = | 1089 AutomationProviderList* list = |
| 1090 g_browser_process->InitAutomationProviderList(); | 1090 g_browser_process->InitAutomationProviderList(); |
| 1091 DCHECK(list); | 1091 DCHECK(list); |
| 1092 list->AddProvider(automation); | 1092 list->AddProvider(automation); |
| 1093 | 1093 |
| 1094 return true; | 1094 return true; |
| 1095 } | 1095 } |
| OLD | NEW |