ash/common/system/chromeos/power/power_status.cc - Issue 2072013002: mash: Move tray settings and deps to common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/common/system/chromeos/power/power_status.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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.h"	5 #include "ash/common/system/chromeos/power/power_status.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <cmath>	8 #include <cmath>

9	9

10 #include "ash/shell.h"

11 #include "ash/shell_delegate.h"

12 #include "base/logging.h"	10 #include "base/logging.h"

13 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

14 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

15 #include "chromeos/dbus/dbus_thread_manager.h"	13 #include "chromeos/dbus/dbus_thread_manager.h"

16 #include "chromeos/dbus/power_manager_client.h"	14 #include "chromeos/dbus/power_manager_client.h"

17 #include "grit/ash_resources.h"	15 #include "grit/ash_resources.h"

18 #include "grit/ash_strings.h"	16 #include "grit/ash_strings.h"

19 #include "ui/base/l10n/l10n_util.h"	17 #include "ui/base/l10n/l10n_util.h"

20 #include "ui/base/l10n/time_format.h"	18 #include "ui/base/l10n/time_format.h"

21 #include "ui/base/resource/resource_bundle.h"	19 #include "ui/base/resource/resource_bundle.h"

(...skipping 342 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
364 }	362 }

365	363

366 void PowerStatus::PowerChanged(	364 void PowerStatus::PowerChanged(

367 const power_manager::PowerSupplyProperties& proto) {	365 const power_manager::PowerSupplyProperties& proto) {

368 proto_ = proto;	366 proto_ = proto;

369 SanitizeProto(&proto_);	367 SanitizeProto(&proto_);

370 FOR_EACH_OBSERVER(Observer, observers_, OnPowerStatusChanged());	368 FOR_EACH_OBSERVER(Observer, observers_, OnPowerStatusChanged());

371 }	369 }

372	370

373 } // namespace ash	371 } // namespace ash

OLD	NEW

« ash/common/DEPS ('K') | « ash/common/system/chromeos/power/power_status.h ('k') | ash/common/system/chromeos/power/power_status_unittest.cc » ('j') | no next file with comments »