Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 5384002: net: Remove typedef net::URLRequest URLRequest; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)) 758 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
759 browser->ToggleFullscreenMode(); 759 browser->ToggleFullscreenMode();
760 #endif 760 #endif
761 761
762 bool first_tab = true; 762 bool first_tab = true;
763 for (size_t i = 0; i < tabs.size(); ++i) { 763 for (size_t i = 0; i < tabs.size(); ++i) {
764 // We skip URLs that we'd have to launch an external protocol handler for. 764 // We skip URLs that we'd have to launch an external protocol handler for.
765 // This avoids us getting into an infinite loop asking ourselves to open 765 // This avoids us getting into an infinite loop asking ourselves to open
766 // a URL, should the handler be (incorrectly) configured to be us. Anyone 766 // a URL, should the handler be (incorrectly) configured to be us. Anyone
767 // asking us to open such a URL should really ask the handler directly. 767 // asking us to open such a URL should really ask the handler directly.
768 if (!process_startup && !URLRequest::IsHandledURL(tabs[i].url)) 768 if (!process_startup && !net::URLRequest::IsHandledURL(tabs[i].url))
769 continue; 769 continue;
770 770
771 int add_types = first_tab ? TabStripModel::ADD_SELECTED : 771 int add_types = first_tab ? TabStripModel::ADD_SELECTED :
772 TabStripModel::ADD_NONE; 772 TabStripModel::ADD_NONE;
773 add_types |= TabStripModel::ADD_FORCE_INDEX; 773 add_types |= TabStripModel::ADD_FORCE_INDEX;
774 if (tabs[i].is_pinned) 774 if (tabs[i].is_pinned)
775 add_types |= TabStripModel::ADD_PINNED; 775 add_types |= TabStripModel::ADD_PINNED;
776 int index = browser->GetIndexForInsertionDuringRestore(i); 776 int index = browser->GetIndexForInsertionDuringRestore(i);
777 777
778 browser::NavigateParams params(browser, tabs[i].url, 778 browser::NavigateParams params(browser, tabs[i].url,
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1069 return false; 1069 return false;
1070 automation->SetExpectedTabCount(expected_tabs); 1070 automation->SetExpectedTabCount(expected_tabs);
1071 1071
1072 AutomationProviderList* list = 1072 AutomationProviderList* list =
1073 g_browser_process->InitAutomationProviderList(); 1073 g_browser_process->InitAutomationProviderList();
1074 DCHECK(list); 1074 DCHECK(list);
1075 list->AddProvider(automation); 1075 list->AddProvider(automation);
1076 1076
1077 return true; 1077 return true;
1078 } 1078 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698