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/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1237 } | 1237 } |
1238 BrowserThread::PostTask( | 1238 BrowserThread::PostTask( |
1239 BrowserThread::FILE, FROM_HERE, new CheckDefaultBrowserTask()); | 1239 BrowserThread::FILE, FROM_HERE, new CheckDefaultBrowserTask()); |
1240 } | 1240 } |
1241 | 1241 |
1242 std::vector<GURL> BrowserInit::GetURLsFromCommandLine( | 1242 std::vector<GURL> BrowserInit::GetURLsFromCommandLine( |
1243 const CommandLine& command_line, | 1243 const CommandLine& command_line, |
1244 const FilePath& cur_dir, | 1244 const FilePath& cur_dir, |
1245 Profile* profile) { | 1245 Profile* profile) { |
1246 std::vector<GURL> urls; | 1246 std::vector<GURL> urls; |
1247 CommandLine::StringVector params = command_line.args(); | 1247 const CommandLine::StringVector& params = command_line.GetArgs(); |
1248 | 1248 |
1249 for (size_t i = 0; i < params.size(); ++i) { | 1249 for (size_t i = 0; i < params.size(); ++i) { |
1250 FilePath param = FilePath(params[i]); | 1250 FilePath param = FilePath(params[i]); |
1251 // Handle Vista way of searching - "? <search-term>" | 1251 // Handle Vista way of searching - "? <search-term>" |
1252 if (param.value().size() > 2 && | 1252 if (param.value().size() > 2 && |
1253 param.value()[0] == '?' && param.value()[1] == ' ') { | 1253 param.value()[0] == '?' && param.value()[1] == ' ') { |
1254 const TemplateURL* default_provider = | 1254 const TemplateURL* default_provider = |
1255 TemplateURLServiceFactory::GetForProfile(profile)-> | 1255 TemplateURLServiceFactory::GetForProfile(profile)-> |
1256 GetDefaultSearchProvider(); | 1256 GetDefaultSearchProvider(); |
1257 if (default_provider && default_provider->url()) { | 1257 if (default_provider && default_provider->url()) { |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1438 return false; | 1438 return false; |
1439 automation->SetExpectedTabCount(expected_tabs); | 1439 automation->SetExpectedTabCount(expected_tabs); |
1440 | 1440 |
1441 AutomationProviderList* list = | 1441 AutomationProviderList* list = |
1442 g_browser_process->InitAutomationProviderList(); | 1442 g_browser_process->InitAutomationProviderList(); |
1443 DCHECK(list); | 1443 DCHECK(list); |
1444 list->AddProvider(automation); | 1444 list->AddProvider(automation); |
1445 | 1445 |
1446 return true; | 1446 return true; |
1447 } | 1447 } |
OLD | NEW |