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/browser_init.h" | 5 #include "chrome/browser/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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
434 chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver( | 434 chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver( |
435 low_battery_observer); | 435 low_battery_observer); |
436 | 436 |
437 static chromeos::UpdateObserver* update_observer = | 437 static chromeos::UpdateObserver* update_observer = |
438 new chromeos::UpdateObserver(profile); | 438 new chromeos::UpdateObserver(profile); |
439 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->AddObserver( | 439 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->AddObserver( |
440 update_observer); | 440 update_observer); |
441 | 441 |
442 static chromeos::NetworkMessageObserver* network_message_observer = | 442 static chromeos::NetworkMessageObserver* network_message_observer = |
443 new chromeos::NetworkMessageObserver(profile); | 443 new chromeos::NetworkMessageObserver(profile); |
444 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver( | 444 chromeos::CrosLibrary::Get()->GetNetworkLibrary() |
445 network_message_observer); | 445 ->AddNetworkManagerObserver(network_message_observer); |
| 446 chromeos::CrosLibrary::Get()->GetNetworkLibrary() |
| 447 ->AddCellularDataPlanObserver(network_message_observer); |
446 | 448 |
447 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver( | 449 chromeos::CrosLibrary::Get()->GetNetworkLibrary() |
448 chromeos::NetworkStateNotifier::Get()); | 450 ->AddNetworkManagerObserver(chromeos::NetworkStateNotifier::Get()); |
449 } | 451 } |
450 #endif | 452 #endif |
451 return true; | 453 return true; |
452 } | 454 } |
453 | 455 |
454 // Tab ------------------------------------------------------------------------ | 456 // Tab ------------------------------------------------------------------------ |
455 | 457 |
456 BrowserInit::LaunchWithProfile::Tab::Tab() : is_app(false), is_pinned(true) {} | 458 BrowserInit::LaunchWithProfile::Tab::Tab() : is_app(false), is_pinned(true) {} |
457 | 459 |
458 BrowserInit::LaunchWithProfile::Tab::~Tab() {} | 460 BrowserInit::LaunchWithProfile::Tab::~Tab() {} |
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1024 scoped_refptr<AutomationProviderClass> automation = | 1026 scoped_refptr<AutomationProviderClass> automation = |
1025 new AutomationProviderClass(profile); | 1027 new AutomationProviderClass(profile); |
1026 automation->ConnectToChannel(channel_id); | 1028 automation->ConnectToChannel(channel_id); |
1027 automation->SetExpectedTabCount(expected_tabs); | 1029 automation->SetExpectedTabCount(expected_tabs); |
1028 | 1030 |
1029 AutomationProviderList* list = | 1031 AutomationProviderList* list = |
1030 g_browser_process->InitAutomationProviderList(); | 1032 g_browser_process->InitAutomationProviderList(); |
1031 DCHECK(list); | 1033 DCHECK(list); |
1032 list->AddProvider(automation); | 1034 list->AddProvider(automation); |
1033 } | 1035 } |
OLD | NEW |