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

Unified Diff: ash/system/screen_security/screen_tray_item.h

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 side-by-side diff with in-line comments
Download patch
Index: ash/system/screen_security/screen_tray_item.h
diff --git a/ash/common/system/chromeos/screen_security/screen_tray_item.h b/ash/system/screen_security/screen_tray_item.h
similarity index 89%
rename from ash/common/system/chromeos/screen_security/screen_tray_item.h
rename to ash/system/screen_security/screen_tray_item.h
index 5ed992a3d78f4f76305f2aa65ab471954cc430f8..14d658c8c2f6314a1d1eaf7db7aa1ad0c5539c44 100644
--- a/ash/common/system/chromeos/screen_security/screen_tray_item.h
+++ b/ash/system/screen_security/screen_tray_item.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
-#define ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
+#ifndef ASH_SYSTEM_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
+#define ASH_SYSTEM_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
#include <string>
-#include "ash/common/system/tray/system_tray.h"
-#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/common/system/tray/tray_item_view.h"
-#include "ash/common/system/tray/tray_notification_view.h"
+#include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_item.h"
+#include "ash/system/tray/tray_item_view.h"
+#include "ash/system/tray/tray_notification_view.h"
#include "base/macros.h"
#include "ui/message_center/notification_delegate.h"
#include "ui/views/controls/button/button.h"
@@ -137,4 +137,4 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem {
} // namespace ash
-#endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
+#endif // ASH_SYSTEM_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
« no previous file with comments | « ash/system/screen_security/screen_share_tray_item.cc ('k') | ash/system/screen_security/screen_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698