ash/system/chromeos/power/power_status_view.cc - Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/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/system/chromeos/power/power_status_view.cc

Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « ash/system/chromeos/network/vpn_list_view.cc ('k') | ash/system/chromeos/power/tray_power.cc » ('j') | no next file with comments »

OLD	NEW
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/chromeos/power/power_status_view.h"	5 #include "ash/system/chromeos/power/power_status_view.h"

6	6

	7 #include "ash/common/system/tray/fixed_sized_image_view.h"

	8 #include "ash/common/system/tray/tray_constants.h"

7 #include "ash/shell.h"	9 #include "ash/shell.h"

8 #include "ash/shell_delegate.h"	10 #include "ash/shell_delegate.h"

9 #include "ash/system/chromeos/power/power_status.h"	11 #include "ash/system/chromeos/power/power_status.h"

10 #include "ash/system/chromeos/power/tray_power.h"	12 #include "ash/system/chromeos/power/tray_power.h"

11 #include "ash/system/tray/fixed_sized_image_view.h"

12 #include "ash/system/tray/tray_constants.h"

13 #include "base/i18n/message_formatter.h"	13 #include "base/i18n/message_formatter.h"

14 #include "base/i18n/time_formatting.h"	14 #include "base/i18n/time_formatting.h"

15 #include "base/strings/utf_string_conversions.h"	15 #include "base/strings/utf_string_conversions.h"

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

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

18 #include "ui/views/controls/image_view.h"	18 #include "ui/views/controls/image_view.h"

19 #include "ui/views/controls/label.h"	19 #include "ui/views/controls/label.h"

20 #include "ui/views/layout/box_layout.h"	20 #include "ui/views/layout/box_layout.h"

21 #include "ui/views/layout/grid_layout.h"	21 #include "ui/views/layout/grid_layout.h"

22	22

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 // Move the time_status_label_, separator_label_, and percentage_label_	142 // Move the time_status_label_, separator_label_, and percentage_label_

143 // closer to each other.	143 // closer to each other.

144 if (percentage_label_ && separator_label_ && time_status_label_ &&	144 if (percentage_label_ && separator_label_ && time_status_label_ &&

145 percentage_label_->visible() && time_status_label_->visible()) {	145 percentage_label_->visible() && time_status_label_->visible()) {

146 separator_label_->SetX(percentage_label_->bounds().right() + 1);	146 separator_label_->SetX(percentage_label_->bounds().right() + 1);

147 time_status_label_->SetX(separator_label_->bounds().right() + 1);	147 time_status_label_->SetX(separator_label_->bounds().right() + 1);

148 }	148 }

149 }	149 }

150	150

151 } // namespace ash	151 } // namespace ash

OLD	NEW