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

Side by Side Diff: ash/system/chromeos/power/power_status_view_unittest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ash/system/chromeos/power/power_status_view.cc ('k') | ash/system/chromeos/power/tray_power.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/power/power_status_view.h" 5 #include "ash/system/chromeos/power/power_status_view.h"
6 6
7 #include "ash/system/chromeos/power/power_status.h" 7 #include "ash/system/chromeos/power/power_status.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" 9 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
10 #include "grit/ash_strings.h" 10 #include "grit/ash_strings.h"
11 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
12 #include "ui/base/l10n/time_format.h" 12 #include "ui/base/l10n/time_format.h"
13 #include "ui/views/controls/label.h" 13 #include "ui/views/controls/label.h"
14 14
15 using power_manager::PowerSupplyProperties; 15 using power_manager::PowerSupplyProperties;
16 16
17 namespace ash { 17 namespace ash {
18 namespace internal {
19 18
20 class PowerStatusViewTest : public test::AshTestBase { 19 class PowerStatusViewTest : public test::AshTestBase {
21 public: 20 public:
22 PowerStatusViewTest() {} 21 PowerStatusViewTest() {}
23 virtual ~PowerStatusViewTest() {} 22 virtual ~PowerStatusViewTest() {}
24 23
25 // Overridden from testing::Test: 24 // Overridden from testing::Test:
26 virtual void SetUp() OVERRIDE { 25 virtual void SetUp() OVERRIDE {
27 test::AshTestBase::SetUp(); 26 test::AshTestBase::SetUp();
28 view_.reset(new PowerStatusView(GetViewType(), false)); 27 view_.reset(new PowerStatusView(GetViewType(), false));
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 204
206 // Tricky -- connected to non-USB but still discharging. Not likely happening 205 // Tricky -- connected to non-USB but still discharging. Not likely happening
207 // on production though. 206 // on production though.
208 prop.set_external_power(PowerSupplyProperties::AC); 207 prop.set_external_power(PowerSupplyProperties::AC);
209 prop.set_battery_state(PowerSupplyProperties::DISCHARGING); 208 prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
210 prop.set_battery_time_to_full_sec(120); 209 prop.set_battery_time_to_full_sec(120);
211 UpdatePowerStatus(prop); 210 UpdatePowerStatus(prop);
212 EXPECT_TRUE(RemainingTimeInView().empty()); 211 EXPECT_TRUE(RemainingTimeInView().empty());
213 } 212 }
214 213
215 } // internal 214 } // namespace ash
216 } // ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/power_status_view.cc ('k') | ash/system/chromeos/power/tray_power.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698