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

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

Issue 2859043: Added system notification for update_engine. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: . Created 10 years, 5 months 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/chromeos/cros/cros_library.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/chromeos/browser_notification_observers.h" 71 #include "chrome/browser/chromeos/browser_notification_observers.h"
72 #include "chrome/browser/chromeos/cros/cros_library.h" 72 #include "chrome/browser/chromeos/cros/cros_library.h"
73 #include "chrome/browser/chromeos/cros/mount_library.h" 73 #include "chrome/browser/chromeos/cros/mount_library.h"
74 #include "chrome/browser/chromeos/cros/network_library.h" 74 #include "chrome/browser/chromeos/cros/network_library.h"
75 #include "chrome/browser/chromeos/customization_document.h" 75 #include "chrome/browser/chromeos/customization_document.h"
76 #include "chrome/browser/chromeos/gview_request_interceptor.h" 76 #include "chrome/browser/chromeos/gview_request_interceptor.h"
77 #include "chrome/browser/chromeos/low_battery_observer.h" 77 #include "chrome/browser/chromeos/low_battery_observer.h"
78 #include "chrome/browser/chromeos/network_message_observer.h" 78 #include "chrome/browser/chromeos/network_message_observer.h"
79 #include "chrome/browser/chromeos/network_state_notifier.h" 79 #include "chrome/browser/chromeos/network_state_notifier.h"
80 #include "chrome/browser/chromeos/system_key_event_listener.h" 80 #include "chrome/browser/chromeos/system_key_event_listener.h"
81 #include "chrome/browser/chromeos/update_observer.h"
81 #include "chrome/browser/chromeos/usb_mount_observer.h" 82 #include "chrome/browser/chromeos/usb_mount_observer.h"
82 #include "chrome/browser/chromeos/wm_message_listener.h" 83 #include "chrome/browser/chromeos/wm_message_listener.h"
83 #include "chrome/browser/chromeos/wm_overview_controller.h" 84 #include "chrome/browser/chromeos/wm_overview_controller.h"
84 #include "chrome/browser/dom_ui/mediaplayer_ui.h" 85 #include "chrome/browser/dom_ui/mediaplayer_ui.h"
85 #endif 86 #endif
86 87
87 namespace { 88 namespace {
88 89
89 class SetAsDefaultBrowserTask : public Task { 90 class SetAsDefaultBrowserTask : public Task {
90 public: 91 public:
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 observe->ScanForDevices(lib); 426 observe->ScanForDevices(lib);
426 // Connect the chromeos notifications 427 // Connect the chromeos notifications
427 428
428 // This observer is a singleton. It is never deleted but the pointer is kept 429 // This observer is a singleton. It is never deleted but the pointer is kept
429 // in a global so that it isn't reported as a leak. 430 // in a global so that it isn't reported as a leak.
430 static chromeos::LowBatteryObserver* low_battery_observer = 431 static chromeos::LowBatteryObserver* low_battery_observer =
431 new chromeos::LowBatteryObserver(profile); 432 new chromeos::LowBatteryObserver(profile);
432 chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver( 433 chromeos::CrosLibrary::Get()->GetPowerLibrary()->AddObserver(
433 low_battery_observer); 434 low_battery_observer);
434 435
436 static chromeos::UpdateObserver* update_observer =
437 new chromeos::UpdateObserver(profile);
438 chromeos::CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(
439 update_observer);
440
435 static chromeos::NetworkMessageObserver* network_message_observer = 441 static chromeos::NetworkMessageObserver* network_message_observer =
436 new chromeos::NetworkMessageObserver(profile); 442 new chromeos::NetworkMessageObserver(profile);
437 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver( 443 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(
438 network_message_observer); 444 network_message_observer);
439 445
440 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver( 446 chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(
441 chromeos::NetworkStateNotifier::Get()); 447 chromeos::NetworkStateNotifier::Get());
442 448
443 // Creates the SystemKeyEventListener to listen for keypress messages 449 // Creates the SystemKeyEventListener to listen for keypress messages
444 // regardless of what window has focus. 450 // regardless of what window has focus.
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 scoped_refptr<AutomationProviderClass> automation = 1063 scoped_refptr<AutomationProviderClass> automation =
1058 new AutomationProviderClass(profile); 1064 new AutomationProviderClass(profile);
1059 automation->ConnectToChannel(channel_id); 1065 automation->ConnectToChannel(channel_id);
1060 automation->SetExpectedTabCount(expected_tabs); 1066 automation->SetExpectedTabCount(expected_tabs);
1061 1067
1062 AutomationProviderList* list = 1068 AutomationProviderList* list =
1063 g_browser_process->InitAutomationProviderList(); 1069 g_browser_process->InitAutomationProviderList();
1064 DCHECK(list); 1070 DCHECK(list);
1065 list->AddProvider(automation); 1071 list->AddProvider(automation);
1066 } 1072 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/chromeos/cros/cros_library.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698