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

Side by Side Diff: ash/system/power/tray_power.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: _ Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/power/tray_power.h" 5 #include "ash/system/power/tray_power.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/date/date_view.h" 8 #include "ash/system/date/date_view.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chromeos/dbus/power_supply_status.h" 14 #include "chromeos/dbus/power_supply_status.h"
15 #include "grit/ash_strings.h" 15 #include "grit/ash_strings.h"
16 #include "grit/ui_resources.h" 16 #include "grit/ui_resources.h"
17 #include "third_party/skia/include/core/SkBitmap.h" 17 #include "third_party/skia/include/core/SkBitmap.h"
18 #include "third_party/skia/include/core/SkRect.h" 18 #include "third_party/skia/include/core/SkRect.h"
19 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
21 #include "ui/gfx/size.h" 22 #include "ui/gfx/size.h"
22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/views/controls/button/button.h" 23 #include "ui/views/controls/button/button.h"
24 #include "ui/views/controls/button/text_button.h" 24 #include "ui/views/controls/button/text_button.h"
25 #include "ui/views/controls/image_view.h" 25 #include "ui/views/controls/image_view.h"
26 #include "ui/views/controls/label.h" 26 #include "ui/views/controls/label.h"
27 #include "ui/views/layout/box_layout.h" 27 #include "ui/views/layout/box_layout.h"
28 #include "ui/views/view.h" 28 #include "ui/views/view.h"
29 #include "ui/views/widget/widget.h" 29 #include "ui/views/widget/widget.h"
30 #include "unicode/fieldpos.h" 30 #include "unicode/fieldpos.h"
31 #include "unicode/fmtable.h" 31 #include "unicode/fmtable.h"
32 32
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 void TrayPower::OnPowerStatusChanged( 210 void TrayPower::OnPowerStatusChanged(
211 const chromeos::PowerSupplyStatus& status) { 211 const chromeos::PowerSupplyStatus& status) {
212 if (power_tray_.get()) 212 if (power_tray_.get())
213 power_tray_->UpdatePowerStatus(status); 213 power_tray_->UpdatePowerStatus(status);
214 if (power_.get()) 214 if (power_.get())
215 power_->UpdatePowerStatus(status); 215 power_->UpdatePowerStatus(status);
216 } 216 }
217 217
218 } // namespace internal 218 } // namespace internal
219 } // namespace ash 219 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698