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

Side by Side Diff: ash/system/tray/system_tray_delegate.h

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/system_tray_controller.cc ('k') | ash/system/tray/system_tray_item.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 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/login_status.h" 13 #include "ash/common/login_status.h"
14 #include "base/callback_forward.h" 14 #include "base/callback_forward.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/i18n/time_formatting.h" 16 #include "base/i18n/time_formatting.h"
17 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
18 18
19 namespace base { 19 namespace base {
20 class TimeDelta; 20 class TimeDelta;
21 class TimeTicks; 21 class TimeTicks;
22 } 22 }
23 23
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // Creates a system tray item for display rotation lock. 197 // Creates a system tray item for display rotation lock.
198 // TODO(jamescook): Remove this when mus has support for display management 198 // TODO(jamescook): Remove this when mus has support for display management
199 // and we have a DisplayManager equivalent. See http://crbug.com/548429 199 // and we have a DisplayManager equivalent. See http://crbug.com/548429
200 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 200 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
201 SystemTray* tray); 201 SystemTray* tray);
202 }; 202 };
203 203
204 } // namespace ash 204 } // namespace ash
205 205
206 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 206 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_controller.cc ('k') | ash/system/tray/system_tray_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698