Chromium Code Reviews| Index: ash/public/cpp/shelf_model.cc |
| diff --git a/ash/shelf/shelf_model.cc b/ash/public/cpp/shelf_model.cc |
| similarity index 97% |
| rename from ash/shelf/shelf_model.cc |
| rename to ash/public/cpp/shelf_model.cc |
| index 3aa6ade522916bbcd7f9c466d2f82945d1b87ced..a332d0160a11586887ac353a304ff6afc2326edd 100644 |
| --- a/ash/shelf/shelf_model.cc |
| +++ b/ash/public/cpp/shelf_model.cc |
| @@ -2,14 +2,12 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "ash/shelf/shelf_model.h" |
| +#include "ash/public/cpp/shelf_model.h" |
| #include <algorithm> |
| #include "ash/public/cpp/shelf_item_delegate.h" |
| -#include "ash/shelf/shelf_model_observer.h" |
| -#include "ash/strings/grit/ash_strings.h" |
| -#include "ui/base/l10n/l10n_util.h" |
| +#include "ash/public/cpp/shelf_model_observer.h" |
| namespace ash { |
| @@ -52,7 +50,6 @@ ShelfModel::ShelfModel() { |
| ShelfItem item; |
| item.type = TYPE_APP_LIST; |
| item.id = ShelfID(kAppListId); |
|
James Cook
2017/06/02 18:22:16
nit: Leave a comment about who sets the title.
msw
2017/06/02 18:25:03
Done.
|
| - item.title = l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE); |
| const int index = Add(item); |
| DCHECK_EQ(0, index); |
| } |