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

Side by Side Diff: ash/shelf/shelf_item_types.h

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs 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/shelf/shelf_item_delegate.cc ('k') | ash/shelf/shelf_item_types.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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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_COMMON_SHELF_SHELF_ITEM_TYPES_H_ 5 #ifndef ASH_SHELF_SHELF_ITEM_TYPES_H_
6 #define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ 6 #define ASH_SHELF_SHELF_ITEM_TYPES_H_
7 7
8 // TODO(msw): Rename these files to shelf_item.*; audit users. 8 // TODO(msw): Rename these files to shelf_item.*; audit users.
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
14 #include "ash/public/cpp/shelf_types.h" 14 #include "ash/public/cpp/shelf_types.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "ui/gfx/image/image_skia.h" 16 #include "ui/gfx/image/image_skia.h"
(...skipping 26 matching lines...) Expand all
43 bool shows_tooltip = true; 43 bool shows_tooltip = true;
44 44
45 // Whether the item is pinned by a policy preference (ie. user cannot un-pin). 45 // Whether the item is pinned by a policy preference (ie. user cannot un-pin).
46 bool pinned_by_policy = false; 46 bool pinned_by_policy = false;
47 }; 47 };
48 48
49 typedef std::vector<ShelfItem> ShelfItems; 49 typedef std::vector<ShelfItem> ShelfItems;
50 50
51 } // namespace ash 51 } // namespace ash
52 52
53 #endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_ 53 #endif // ASH_SHELF_SHELF_ITEM_TYPES_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_item_delegate.cc ('k') | ash/shelf/shelf_item_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698