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

Side by Side Diff: chrome/browser/chromeos/status/status_area_view_chromeos.cc

Issue 8666007: chromeos: Move system resume handling to power manager client (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed order (again) Created 9 years, 1 month 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/browser/chromeos/status/status_area_view_chromeos.h ('k') | no next file » | 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) 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/chromeos/status/status_area_view_chromeos.h" 5 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/cros/cros_library.h" 8 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
9 #include "chrome/browser/chromeos/status/accessibility_menu_button.h" 9 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"
10 #include "chrome/browser/chromeos/status/caps_lock_menu_button.h" 10 #include "chrome/browser/chromeos/status/caps_lock_menu_button.h"
11 #include "chrome/browser/chromeos/status/clock_menu_button.h" 11 #include "chrome/browser/chromeos/status/clock_menu_button.h"
12 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 12 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
13 #include "chrome/browser/chromeos/status/memory_menu_button.h" 13 #include "chrome/browser/chromeos/status/memory_menu_button.h"
14 #include "chrome/browser/chromeos/status/network_menu_button.h" 14 #include "chrome/browser/chromeos/status/network_menu_button.h"
15 #include "chrome/browser/chromeos/status/power_menu_button.h" 15 #include "chrome/browser/chromeos/status/power_menu_button.h"
16 #include "chrome/browser/chromeos/view_ids.h" 16 #include "chrome/browser/chromeos/view_ids.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 StatusAreaViewChromeos::StatusAreaViewChromeos() { 21 StatusAreaViewChromeos::StatusAreaViewChromeos() {
22 CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this); 22 DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
23 system::TimezoneSettings::GetInstance()->AddObserver(this); 23 system::TimezoneSettings::GetInstance()->AddObserver(this);
24 } 24 }
25 25
26 StatusAreaViewChromeos::~StatusAreaViewChromeos() { 26 StatusAreaViewChromeos::~StatusAreaViewChromeos() {
27 CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this); 27 DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
28 system::TimezoneSettings::GetInstance()->RemoveObserver(this); 28 system::TimezoneSettings::GetInstance()->RemoveObserver(this);
29 } 29 }
30 30
31 void StatusAreaViewChromeos::Init(StatusAreaButton::Delegate* delegate, 31 void StatusAreaViewChromeos::Init(StatusAreaButton::Delegate* delegate,
32 ScreenMode screen_mode) { 32 ScreenMode screen_mode) {
33 AddChromeosButtons(this, delegate, screen_mode, NULL); 33 AddChromeosButtons(this, delegate, screen_mode, NULL);
34 } 34 }
35 35
36 void StatusAreaViewChromeos::SystemResumed() { 36 void StatusAreaViewChromeos::SystemResumed() {
37 UpdateClockText(); 37 UpdateClockText();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 *clock_button = clock; 76 *clock_button = clock;
77 77
78 status_area->AddButton( 78 status_area->AddButton(
79 new InputMethodMenuButton(delegate, screen_mode), no_border); 79 new InputMethodMenuButton(delegate, screen_mode), no_border);
80 status_area->AddButton( 80 status_area->AddButton(
81 new NetworkMenuButton(delegate, screen_mode), no_border); 81 new NetworkMenuButton(delegate, screen_mode), no_border);
82 status_area->AddButton(new PowerMenuButton(delegate), no_border); 82 status_area->AddButton(new PowerMenuButton(delegate), no_border);
83 } 83 }
84 84
85 } // namespace chromeos 85 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698