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

Side by Side Diff: ash/system/tray_tracing.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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/tray_caps_lock.cc ('k') | ash/system/update/tray_update.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/tray_tracing.h" 5 #include "ash/system/tray_tracing.h"
6 6
7 #include "ash/common/wm_shell.h"
7 #include "ash/metrics/user_metrics_action.h" 8 #include "ash/metrics/user_metrics_action.h"
8 #include "ash/resources/vector_icons/vector_icons.h" 9 #include "ash/resources/vector_icons/vector_icons.h"
9 #include "ash/strings/grit/ash_strings.h" 10 #include "ash/strings/grit/ash_strings.h"
10 #include "ash/system/tray/actionable_view.h" 11 #include "ash/system/tray/actionable_view.h"
11 #include "ash/system/tray/fixed_sized_image_view.h" 12 #include "ash/system/tray/fixed_sized_image_view.h"
12 #include "ash/system/tray/system_tray.h" 13 #include "ash/system/tray/system_tray.h"
13 #include "ash/system/tray/system_tray_controller.h" 14 #include "ash/system/tray/system_tray_controller.h"
14 #include "ash/system/tray/system_tray_notifier.h" 15 #include "ash/system/tray/system_tray_notifier.h"
15 #include "ash/system/tray/tray_constants.h" 16 #include "ash/system/tray/tray_constants.h"
16 #include "ash/system/tray/tray_popup_item_style.h" 17 #include "ash/system/tray/tray_popup_item_style.h"
17 #include "ash/system/tray/tray_popup_utils.h" 18 #include "ash/system/tray/tray_popup_utils.h"
18 #include "ash/system/tray/tri_view.h" 19 #include "ash/system/tray/tri_view.h"
19 #include "ash/wm_shell.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.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 tray { 28 namespace tray {
29 29
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 default_ = NULL; 105 default_ = NULL;
106 } 106 }
107 107
108 void TrayTracing::DestroyDetailedView() {} 108 void TrayTracing::DestroyDetailedView() {}
109 109
110 void TrayTracing::OnTracingModeChanged(bool value) { 110 void TrayTracing::OnTracingModeChanged(bool value) {
111 SetTrayIconVisible(value); 111 SetTrayIconVisible(value);
112 } 112 }
113 113
114 } // namespace ash 114 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/system/update/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698