| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/browser_init.h" | 5 #include "chrome/browser/browser_init.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
| 10 #include "app/win_util.h" | 10 #include "app/win_util.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 } | 345 } |
| 346 | 346 |
| 347 #if defined(OS_CHROMEOS) | 347 #if defined(OS_CHROMEOS) |
| 348 // Create the TabOverviewMessageListener so that it can listen for messages | 348 // Create the TabOverviewMessageListener so that it can listen for messages |
| 349 // regardless of what window has focus. | 349 // regardless of what window has focus. |
| 350 TabOverviewMessageListener::instance(); | 350 TabOverviewMessageListener::instance(); |
| 351 #endif | 351 #endif |
| 352 return true; | 352 return true; |
| 353 } | 353 } |
| 354 | 354 |
| 355 #if defined(OS_WIN) | |
| 356 GURL GetWelcomePageURL() { | 355 GURL GetWelcomePageURL() { |
| 357 std::wstring welcome_url = l10n_util::GetString(IDS_WELCOME_PAGE_URL); | 356 std::string welcome_url = l10n_util::GetStringUTF8(IDS_WELCOME_PAGE_URL); |
| 358 return GURL(welcome_url); | 357 return GURL(welcome_url); |
| 359 } | 358 } |
| 360 #else | |
| 361 GURL GetWelcomePageURL() { | |
| 362 // TODO(port): implement welcome page. | |
| 363 NOTIMPLEMENTED(); | |
| 364 return GURL(); | |
| 365 } | |
| 366 #endif | |
| 367 | 359 |
| 368 } // namespace | 360 } // namespace |
| 369 | 361 |
| 370 // static | 362 // static |
| 371 bool BrowserInit::InProcessStartup() { | 363 bool BrowserInit::InProcessStartup() { |
| 372 return in_startup; | 364 return in_startup; |
| 373 } | 365 } |
| 374 | 366 |
| 375 // LaunchWithProfile ---------------------------------------------------------- | 367 // LaunchWithProfile ---------------------------------------------------------- |
| 376 | 368 |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 843 scoped_refptr<AutomationProviderClass> automation = | 835 scoped_refptr<AutomationProviderClass> automation = |
| 844 new AutomationProviderClass(profile); | 836 new AutomationProviderClass(profile); |
| 845 automation->ConnectToChannel(channel_id); | 837 automation->ConnectToChannel(channel_id); |
| 846 automation->SetExpectedTabCount(expected_tabs); | 838 automation->SetExpectedTabCount(expected_tabs); |
| 847 | 839 |
| 848 AutomationProviderList* list = | 840 AutomationProviderList* list = |
| 849 g_browser_process->InitAutomationProviderList(); | 841 g_browser_process->InitAutomationProviderList(); |
| 850 DCHECK(list); | 842 DCHECK(list); |
| 851 list->AddProvider(automation); | 843 list->AddProvider(automation); |
| 852 } | 844 } |
| OLD | NEW |