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

Side by Side Diff: ash/system/settings/tray_settings.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/settings/tray_settings.h ('k') | ash/system/status_area_layout_manager.h » ('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/chromeos/settings/tray_settings.h" 5 #include "ash/system/settings/tray_settings.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/system/chromeos/power/power_status.h"
10 #include "ash/common/system/chromeos/power/power_status_view.h"
11 #include "ash/common/system/tray/actionable_view.h"
12 #include "ash/common/system/tray/fixed_sized_image_view.h"
13 #include "ash/common/system/tray/system_tray_controller.h"
14 #include "ash/common/system/tray/system_tray_delegate.h"
15 #include "ash/common/system/tray/tray_constants.h"
16 #include "ash/common/system/tray/tray_popup_utils.h"
17 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
18 #include "ash/resources/grit/ash_resources.h" 10 #include "ash/resources/grit/ash_resources.h"
19 #include "ash/strings/grit/ash_strings.h" 11 #include "ash/strings/grit/ash_strings.h"
12 #include "ash/system/power/power_status.h"
13 #include "ash/system/power/power_status_view.h"
14 #include "ash/system/tray/actionable_view.h"
15 #include "ash/system/tray/fixed_sized_image_view.h"
16 #include "ash/system/tray/system_tray_controller.h"
17 #include "ash/system/tray/system_tray_delegate.h"
18 #include "ash/system/tray/tray_constants.h"
19 #include "ash/system/tray/tray_popup_utils.h"
20 #include "base/logging.h" 20 #include "base/logging.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "third_party/skia/include/core/SkColor.h" 22 #include "third_party/skia/include/core/SkColor.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/gfx/image/image.h" 24 #include "ui/gfx/image/image.h"
25 #include "ui/views/controls/image_view.h" 25 #include "ui/views/controls/image_view.h"
26 #include "ui/views/controls/label.h" 26 #include "ui/views/controls/label.h"
27 #include "ui/views/layout/box_layout.h" 27 #include "ui/views/layout/box_layout.h"
28 #include "ui/views/layout/fill_layout.h" 28 #include "ui/views/layout/fill_layout.h"
29 #include "ui/views/view.h" 29 #include "ui/views/view.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 void TraySettings::DestroyDefaultView() { 168 void TraySettings::DestroyDefaultView() {
169 default_view_ = nullptr; 169 default_view_ = nullptr;
170 } 170 }
171 171
172 void TraySettings::DestroyDetailedView() {} 172 void TraySettings::DestroyDetailedView() {}
173 173
174 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {} 174 void TraySettings::UpdateAfterLoginStatusChange(LoginStatus status) {}
175 175
176 } // namespace ash 176 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/settings/tray_settings.h ('k') | ash/system/status_area_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698