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

Side by Side Diff: ash/mus/shelf_delegate_mus.h

Issue 1932503002: Fix mash shelf id mapping and removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | ash/mus/shelf_delegate_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_MUS_SHELF_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELF_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELF_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELF_DELEGATE_MUS_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/shelf/shelf_delegate.h" 10 #include "ash/shelf/shelf_delegate.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 ShelfModel* model_; 68 ShelfModel* model_;
69 69
70 mojo::AssociatedInterfacePtrSet<mash::shelf::mojom::ShelfObserver> observers_; 70 mojo::AssociatedInterfacePtrSet<mash::shelf::mojom::ShelfObserver> observers_;
71 71
72 mash::wm::mojom::ShelfLayoutPtr shelf_layout_; 72 mash::wm::mojom::ShelfLayoutPtr shelf_layout_;
73 mash::wm::mojom::UserWindowControllerPtr user_window_controller_; 73 mash::wm::mojom::UserWindowControllerPtr user_window_controller_;
74 mojo::Binding<mash::wm::mojom::UserWindowObserver> binding_; 74 mojo::Binding<mash::wm::mojom::UserWindowObserver> binding_;
75 std::map<uint32_t, ShelfID> window_id_to_shelf_id_; 75 std::map<uint32_t, ShelfID> window_id_to_shelf_id_;
76 76
77 std::map<std::string, ShelfID> app_id_to_shelf_id_; 77 std::map<std::string, ShelfID> app_id_to_shelf_id_;
78 std::map<ShelfID, std::string> shelf_id_to_app_id_;
78 79
79 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); 80 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
80 }; 81 };
81 82
82 } // namespace sysui 83 } // namespace sysui
83 } // namespace ash 84 } // namespace ash
84 85
85 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_ 86 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/shelf_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698