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

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

Issue 2869473002: Fix crash on openning settings when DCHECK is on. (Closed)
Patch Set: up Created 3 years, 7 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
OLDNEW
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 #ifndef ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ 5 #ifndef ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
6 #define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ 6 #define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
7 7
8 #include "ash/public/cpp/shelf_item_delegate.h" 8 #include "ash/public/cpp/shelf_item_delegate.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace ash { 11 namespace ash {
12 class ShelfModel; 12 class ShelfModel;
13 13
14 // ShelfItemDelegate for TYPE_APP_LIST. 14 // ShelfItemDelegate for TYPE_APP_LIST.
15 class AppListShelfItemDelegate : public ShelfItemDelegate { 15 class AppListShelfItemDelegate : public ShelfItemDelegate {
16 public: 16 public:
17 // Initializes the app list item in the shelf data model and creates an 17 // Initializes the app list item in the shelf data model and creates an
18 // AppListShelfItemDelegate which will be owned by |model|. 18 // AppListShelfItemDelegate which will be owned by |model|.
19 static void CreateAppListItemAndDelegate(ShelfModel* model); 19 static void CreateAppListItemAndDelegate(ShelfModel* model);
20 20
21 // An app id for the app list, used to identify the shelf item.
22 static const char kAppListId[];
23
21 AppListShelfItemDelegate(); 24 AppListShelfItemDelegate();
22 ~AppListShelfItemDelegate() override; 25 ~AppListShelfItemDelegate() override;
23 26
24 // ShelfItemDelegate: 27 // ShelfItemDelegate:
25 void ItemSelected(std::unique_ptr<ui::Event> event, 28 void ItemSelected(std::unique_ptr<ui::Event> event,
26 int64_t display_id, 29 int64_t display_id,
27 ShelfLaunchSource source, 30 ShelfLaunchSource source,
28 const ItemSelectedCallback& callback) override; 31 const ItemSelectedCallback& callback) override;
29 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override; 32 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
30 void Close() override; 33 void Close() override;
31 34
32 private: 35 private:
33 DISALLOW_COPY_AND_ASSIGN(AppListShelfItemDelegate); 36 DISALLOW_COPY_AND_ASSIGN(AppListShelfItemDelegate);
34 }; 37 };
35 38
36 } // namespace ash 39 } // namespace ash
37 40
38 #endif // ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_ 41 #endif // ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/app_list_shelf_item_delegate.cc » ('j') | ash/shelf/app_list_shelf_item_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698