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

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

Issue 6904160: Implement new gray mock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review nits Created 9 years, 7 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 | Annotate | Revision Log
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/power_menu_button.h" 5 #include "chrome/browser/chromeos/status/power_menu_button.h"
6 6
7 #include "base/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/time.h" 8 #include "base/time.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
11 #include "grit/generated_resources.h" 11 #include "grit/generated_resources.h"
12 #include "grit/theme_resources.h" 12 #include "grit/theme_resources.h"
13 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
15 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 //////////////////////////////////////////////////////////////////////////////// 19 ////////////////////////////////////////////////////////////////////////////////
20 // PowerMenuButton 20 // PowerMenuButton
21 21
22 // static 22 // static
23 const int PowerMenuButton::kNumPowerImages = 16; 23 const int PowerMenuButton::kNumPowerImages = 19;
24 24
25 PowerMenuButton::PowerMenuButton() 25 PowerMenuButton::PowerMenuButton(StatusAreaHost* host)
26 : StatusAreaButton(this), 26 : StatusAreaButton(host, this),
27 battery_is_present_(false), 27 battery_is_present_(false),
28 line_power_on_(false), 28 line_power_on_(false),
29 battery_fully_charged_(false), 29 battery_fully_charged_(false),
30 battery_percentage_(0.0), 30 battery_percentage_(0.0),
31 icon_id_(-1), 31 icon_id_(-1),
32 ALLOW_THIS_IN_INITIALIZER_LIST(power_menu_(this)) { 32 ALLOW_THIS_IN_INITIALIZER_LIST(power_menu_(this)) {
33 UpdateIconAndLabelInfo(); 33 UpdateIconAndLabelInfo();
34 CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this); 34 CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
35 } 35 }
36 36
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 IDR_STATUSBAR_BATTERY_CHARGING_7, 155 IDR_STATUSBAR_BATTERY_CHARGING_7,
156 IDR_STATUSBAR_BATTERY_CHARGING_8, 156 IDR_STATUSBAR_BATTERY_CHARGING_8,
157 IDR_STATUSBAR_BATTERY_CHARGING_9, 157 IDR_STATUSBAR_BATTERY_CHARGING_9,
158 IDR_STATUSBAR_BATTERY_CHARGING_10, 158 IDR_STATUSBAR_BATTERY_CHARGING_10,
159 IDR_STATUSBAR_BATTERY_CHARGING_11, 159 IDR_STATUSBAR_BATTERY_CHARGING_11,
160 IDR_STATUSBAR_BATTERY_CHARGING_12, 160 IDR_STATUSBAR_BATTERY_CHARGING_12,
161 IDR_STATUSBAR_BATTERY_CHARGING_13, 161 IDR_STATUSBAR_BATTERY_CHARGING_13,
162 IDR_STATUSBAR_BATTERY_CHARGING_14, 162 IDR_STATUSBAR_BATTERY_CHARGING_14,
163 IDR_STATUSBAR_BATTERY_CHARGING_15, 163 IDR_STATUSBAR_BATTERY_CHARGING_15,
164 IDR_STATUSBAR_BATTERY_CHARGING_16, 164 IDR_STATUSBAR_BATTERY_CHARGING_16,
165 IDR_STATUSBAR_BATTERY_CHARGING_17,
166 IDR_STATUSBAR_BATTERY_CHARGING_18,
167 IDR_STATUSBAR_BATTERY_CHARGING_19,
165 }; 168 };
166 static const int kDischargingImages[kNumPowerImages] = { 169 static const int kDischargingImages[kNumPowerImages] = {
167 IDR_STATUSBAR_BATTERY_DISCHARGING_1, 170 IDR_STATUSBAR_BATTERY_DISCHARGING_1,
168 IDR_STATUSBAR_BATTERY_DISCHARGING_2, 171 IDR_STATUSBAR_BATTERY_DISCHARGING_2,
169 IDR_STATUSBAR_BATTERY_DISCHARGING_3, 172 IDR_STATUSBAR_BATTERY_DISCHARGING_3,
170 IDR_STATUSBAR_BATTERY_DISCHARGING_4, 173 IDR_STATUSBAR_BATTERY_DISCHARGING_4,
171 IDR_STATUSBAR_BATTERY_DISCHARGING_5, 174 IDR_STATUSBAR_BATTERY_DISCHARGING_5,
172 IDR_STATUSBAR_BATTERY_DISCHARGING_6, 175 IDR_STATUSBAR_BATTERY_DISCHARGING_6,
173 IDR_STATUSBAR_BATTERY_DISCHARGING_7, 176 IDR_STATUSBAR_BATTERY_DISCHARGING_7,
174 IDR_STATUSBAR_BATTERY_DISCHARGING_8, 177 IDR_STATUSBAR_BATTERY_DISCHARGING_8,
175 IDR_STATUSBAR_BATTERY_DISCHARGING_9, 178 IDR_STATUSBAR_BATTERY_DISCHARGING_9,
176 IDR_STATUSBAR_BATTERY_DISCHARGING_10, 179 IDR_STATUSBAR_BATTERY_DISCHARGING_10,
177 IDR_STATUSBAR_BATTERY_DISCHARGING_11, 180 IDR_STATUSBAR_BATTERY_DISCHARGING_11,
178 IDR_STATUSBAR_BATTERY_DISCHARGING_12, 181 IDR_STATUSBAR_BATTERY_DISCHARGING_12,
179 IDR_STATUSBAR_BATTERY_DISCHARGING_13, 182 IDR_STATUSBAR_BATTERY_DISCHARGING_13,
180 IDR_STATUSBAR_BATTERY_DISCHARGING_14, 183 IDR_STATUSBAR_BATTERY_DISCHARGING_14,
181 IDR_STATUSBAR_BATTERY_DISCHARGING_15, 184 IDR_STATUSBAR_BATTERY_DISCHARGING_15,
182 IDR_STATUSBAR_BATTERY_DISCHARGING_16, 185 IDR_STATUSBAR_BATTERY_DISCHARGING_16,
186 IDR_STATUSBAR_BATTERY_DISCHARGING_17,
187 IDR_STATUSBAR_BATTERY_DISCHARGING_18,
188 IDR_STATUSBAR_BATTERY_DISCHARGING_19,
183 }; 189 };
184 190
185 int index = static_cast<int>(battery_percentage_ / 100.0 * 191 int index = static_cast<int>(battery_percentage_ / 100.0 *
186 nextafter(static_cast<float>(kNumPowerImages), 0)); 192 nextafter(static_cast<float>(kNumPowerImages), 0));
187 index = std::max(std::min(index, kNumPowerImages - 1), 0); 193 index = std::max(std::min(index, kNumPowerImages - 1), 0);
188 icon_id_ = line_power_on_ ? 194 icon_id_ = line_power_on_ ?
189 kChargingImages[index] : kDischargingImages[index]; 195 kChargingImages[index] : kDischargingImages[index];
190 } 196 }
191 197
192 SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(icon_id_)); 198 SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(icon_id_));
193 SetTooltipText(UTF16ToWide(GetLabelAt(0))); 199 SetTooltipText(UTF16ToWide(GetLabelAt(0)));
194 power_menu_.Rebuild(); 200 power_menu_.Rebuild();
195 SchedulePaint(); 201 SchedulePaint();
196 } 202 }
197 203
198 } // namespace chromeos 204 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/power_menu_button.h ('k') | chrome/browser/chromeos/status/power_menu_button_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698