| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shelf/shelf_navigator.h" | 5 #include "ash/shelf/shelf_navigator.h" |
| 6 | 6 |
| 7 #include "ash/shelf/shelf_model.h" | 7 #include "ash/common/shelf/shelf_model.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 | 10 |
| 11 namespace { | 11 namespace { |
| 12 | 12 |
| 13 // Returns true if accelerator processing should skip the shelf item with the | 13 // Returns true if accelerator processing should skip the shelf item with the |
| 14 // specified type. | 14 // specified type. |
| 15 bool ShouldSkip(ShelfItemType type) { | 15 bool ShouldSkip(ShelfItemType type) { |
| 16 return type == TYPE_APP_LIST || | 16 return type == TYPE_APP_LIST || |
| 17 type == TYPE_BROWSER_SHORTCUT || | 17 type == TYPE_BROWSER_SHORTCUT || |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 if (item.status == STATUS_ACTIVE) | 63 if (item.status == STATUS_ACTIVE) |
| 64 continue; | 64 continue; |
| 65 | 65 |
| 66 return i; | 66 return i; |
| 67 } | 67 } |
| 68 | 68 |
| 69 return -1; | 69 return -1; |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace ash | 72 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2046513003:
mash: Move shelf model and item classes to ash/common/shelf (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly