ash/system/update/tray_update.cc - Issue 2881183003: Add views::View::set_preferred_size, use it in a few places.

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/update/tray_update.cc

Issue 2881183003: Add views::View::set_preferred_size, use it in a few places. (Closed)

Patch Set: auto* Created 3 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

« no previous file with comments | « ash/system/tray_tracing.cc ('k') | ash/system/user/user_card_view.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/update/tray_update.h"	5 #include "ash/system/update/tray_update.h"

6	6

7 #include "ash/metrics/user_metrics_action.h"	7 #include "ash/metrics/user_metrics_action.h"

8 #include "ash/public/interfaces/update.mojom.h"	8 #include "ash/public/interfaces/update.mojom.h"

9 #include "ash/resources/vector_icons/vector_icons.h"	9 #include "ash/resources/vector_icons/vector_icons.h"

10 #include "ash/shell.h"	10 #include "ash/shell.h"

11 #include "ash/shell_port.h"	11 #include "ash/shell_port.h"

12 #include "ash/strings/grit/ash_strings.h"	12 #include "ash/strings/grit/ash_strings.h"

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

14 #include "ash/system/tray/system_tray.h"	13 #include "ash/system/tray/system_tray.h"

15 #include "ash/system/tray/system_tray_controller.h"	14 #include "ash/system/tray/system_tray_controller.h"

16 #include "ash/system/tray/system_tray_delegate.h"	15 #include "ash/system/tray/system_tray_delegate.h"

17 #include "ash/system/tray/tray_constants.h"	16 #include "ash/system/tray/tray_constants.h"

18 #include "ash/system/tray/tray_popup_item_style.h"	17 #include "ash/system/tray/tray_popup_item_style.h"

19 #include "ash/system/tray/tray_popup_utils.h"	18 #include "ash/system/tray/tray_popup_utils.h"

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

21 #include "ui/gfx/color_palette.h"	20 #include "ui/gfx/color_palette.h"

22 #include "ui/gfx/image/image.h"	21 #include "ui/gfx/image/image.h"

23 #include "ui/gfx/paint_vector_icon.h"	22 #include "ui/gfx/paint_vector_icon.h"

(...skipping 128 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 // Show the icon in the tray.	151 // Show the icon in the tray.

153 SetIconColor(IconColorForUpdateSeverity(severity_, false));	152 SetIconColor(IconColorForUpdateSeverity(severity_, false));

154 tray_view()->SetVisible(true);	153 tray_view()->SetVisible(true);

155 }	154 }

156	155

157 views::Label* TrayUpdate::GetLabelForTesting() {	156 views::Label* TrayUpdate::GetLabelForTesting() {

158 return update_view_ ? update_view_->update_label_ : nullptr;	157 return update_view_ ? update_view_->update_label_ : nullptr;

159 }	158 }

160	159

161 } // namespace ash	160 } // namespace ash

OLD	NEW