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

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

Issue 2014013002: Add SkBitmap StructTraits for skia::mojo::Bitmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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/sysui/DEPS ('k') | ash/sysui/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_SYSUI_SHELF_DELEGATE_MUS_H_ 5 #ifndef ASH_SYSUI_SHELF_DELEGATE_MUS_H_
6 #define ASH_SYSUI_SHELF_DELEGATE_MUS_H_ 6 #define ASH_SYSUI_SHELF_DELEGATE_MUS_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/public/interfaces/shelf_layout.mojom.h" 10 #include "ash/public/interfaces/shelf_layout.mojom.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // mash::shelf::mojom::ShelfController: 47 // mash::shelf::mojom::ShelfController:
48 void AddObserver( 48 void AddObserver(
49 mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override; 49 mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override;
50 void SetAlignment(mash::shelf::mojom::Alignment alignment) override; 50 void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
51 void SetAutoHideBehavior( 51 void SetAutoHideBehavior(
52 mash::shelf::mojom::AutoHideBehavior auto_hide) override; 52 mash::shelf::mojom::AutoHideBehavior auto_hide) override;
53 void PinItem( 53 void PinItem(
54 mash::shelf::mojom::ShelfItemPtr item, 54 mash::shelf::mojom::ShelfItemPtr item,
55 mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override; 55 mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;
56 void UnpinItem(const mojo::String& app_id) override; 56 void UnpinItem(const mojo::String& app_id) override;
57 void SetItemImage(const mojo::String& app_id, 57 void SetItemImage(const mojo::String& app_id, const SkBitmap& image) override;
58 skia::mojom::BitmapPtr image) override;
59 58
60 // mojom::UserWindowObserver: 59 // mojom::UserWindowObserver:
61 void OnUserWindowObserverAdded( 60 void OnUserWindowObserverAdded(
62 mojo::Array<mojom::UserWindowPtr> user_windows) override; 61 mojo::Array<mojom::UserWindowPtr> user_windows) override;
63 void OnUserWindowAdded(mojom::UserWindowPtr user_window) override; 62 void OnUserWindowAdded(mojom::UserWindowPtr user_window) override;
64 void OnUserWindowRemoved(uint32_t window_id) override; 63 void OnUserWindowRemoved(uint32_t window_id) override;
65 void OnUserWindowTitleChanged(uint32_t window_id, 64 void OnUserWindowTitleChanged(uint32_t window_id,
66 const mojo::String& window_title) override; 65 const mojo::String& window_title) override;
67 void OnUserWindowAppIconChanged(uint32_t window_id, 66 void OnUserWindowAppIconChanged(uint32_t window_id,
68 mojo::Array<uint8_t> app_icon) override; 67 mojo::Array<uint8_t> app_icon) override;
(...skipping 14 matching lines...) Expand all
83 std::map<std::string, ShelfID> app_id_to_shelf_id_; 82 std::map<std::string, ShelfID> app_id_to_shelf_id_;
84 std::map<ShelfID, std::string> shelf_id_to_app_id_; 83 std::map<ShelfID, std::string> shelf_id_to_app_id_;
85 84
86 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); 85 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
87 }; 86 };
88 87
89 } // namespace sysui 88 } // namespace sysui
90 } // namespace ash 89 } // namespace ash
91 90
92 #endif // ASH_SYSUI_SHELF_DELEGATE_MUS_H_ 91 #endif // ASH_SYSUI_SHELF_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « ash/sysui/DEPS ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698