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

Unified Diff: mash/shelf/shelf_types.h

Issue 1585363002: Fork a subset of ash/shelf for use in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ui/resources dep; comment out unused constants. Created 4 years, 11 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
« no previous file with comments | « mash/shelf/shelf_tooltip_manager.cc ('k') | mash/shelf/shelf_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/shelf/shelf_types.h
diff --git a/ash/shelf/shelf_types.h b/mash/shelf/shelf_types.h
similarity index 85%
copy from ash/shelf/shelf_types.h
copy to mash/shelf/shelf_types.h
index 4ee3b94c09a94a373efb59163d8aed64c0351adf..e2a7ee4a6faab4f999f3ccf85db370d312f84aac 100644
--- a/ash/shelf/shelf_types.h
+++ b/mash/shelf/shelf_types.h
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_TYPES_H_
-#define ASH_SHELF_SHELF_TYPES_H_
+#ifndef MASH_SHELF_SHELF_TYPES_H_
+#define MASH_SHELF_SHELF_TYPES_H_
-namespace ash {
+namespace mash {
+namespace shelf {
enum ShelfAlignment {
SHELF_ALIGNMENT_BOTTOM,
@@ -52,6 +53,7 @@ enum ShelfBackgroundType {
SHELF_BACKGROUND_MAXIMIZED,
};
-} // namespace ash
+} // namespace shelf
+} // namespace mash
-#endif // ASH_SHELF_SHELF_TYPES_H_
+#endif // MASH_SHELF_SHELF_TYPES_H_
« no previous file with comments | « mash/shelf/shelf_tooltip_manager.cc ('k') | mash/shelf/shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698