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

Side by Side Diff: ash/system/update/tray_update.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 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
« no previous file with comments | « ash/system/update/tray_update.h ('k') | ash/system/update/tray_update_unittest.cc » ('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 (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/common/system/update/tray_update.h" 5 #include "ash/system/update/tray_update.h"
6 6
7 #include "ash/common/metrics/user_metrics_action.h" 7 #include "ash/common/metrics/user_metrics_action.h"
8 #include "ash/common/system/tray/fixed_sized_image_view.h"
9 #include "ash/common/system/tray/system_tray.h"
10 #include "ash/common/system/tray/system_tray_controller.h"
11 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "ash/common/system/tray/tray_constants.h"
13 #include "ash/common/system/tray/tray_popup_item_style.h"
14 #include "ash/common/system/tray/tray_popup_utils.h"
15 #include "ash/common/wm_shell.h" 8 #include "ash/common/wm_shell.h"
16 #include "ash/public/interfaces/update.mojom.h" 9 #include "ash/public/interfaces/update.mojom.h"
17 #include "ash/resources/vector_icons/vector_icons.h" 10 #include "ash/resources/vector_icons/vector_icons.h"
18 #include "ash/strings/grit/ash_strings.h" 11 #include "ash/strings/grit/ash_strings.h"
12 #include "ash/system/tray/fixed_sized_image_view.h"
13 #include "ash/system/tray/system_tray.h"
14 #include "ash/system/tray/system_tray_controller.h"
15 #include "ash/system/tray/system_tray_delegate.h"
16 #include "ash/system/tray/tray_constants.h"
17 #include "ash/system/tray/tray_popup_item_style.h"
18 #include "ash/system/tray/tray_popup_utils.h"
19 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/gfx/color_palette.h" 20 #include "ui/gfx/color_palette.h"
21 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
22 #include "ui/gfx/paint_vector_icon.h" 22 #include "ui/gfx/paint_vector_icon.h"
23 #include "ui/views/controls/image_view.h" 23 #include "ui/views/controls/image_view.h"
24 #include "ui/views/controls/label.h" 24 #include "ui/views/controls/label.h"
25 #include "ui/views/layout/fill_layout.h" 25 #include "ui/views/layout/fill_layout.h"
26 26
27 namespace ash { 27 namespace ash {
28 namespace { 28 namespace {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 update_required_ = true; 127 update_required_ = true;
128 severity_ = severity; 128 severity_ = severity;
129 factory_reset_required_ = factory_reset_required; 129 factory_reset_required_ = factory_reset_required;
130 130
131 // Show the icon in the tray. 131 // Show the icon in the tray.
132 SetIconColor(IconColorForUpdateSeverity(severity_, false)); 132 SetIconColor(IconColorForUpdateSeverity(severity_, false));
133 tray_view()->SetVisible(true); 133 tray_view()->SetVisible(true);
134 } 134 }
135 135
136 } // namespace ash 136 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/update/tray_update.h ('k') | ash/system/update/tray_update_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698