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

Side by Side Diff: ash/mus/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: Add mojo/public/cpp/bindings typemap deps. 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
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // mash::shelf::mojom::ShelfController: 43 // mash::shelf::mojom::ShelfController:
44 void AddObserver( 44 void AddObserver(
45 mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override; 45 mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override;
46 void SetAlignment(mash::shelf::mojom::Alignment alignment) override; 46 void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
47 void SetAutoHideBehavior( 47 void SetAutoHideBehavior(
48 mash::shelf::mojom::AutoHideBehavior auto_hide) override; 48 mash::shelf::mojom::AutoHideBehavior auto_hide) override;
49 void PinItem( 49 void PinItem(
50 mash::shelf::mojom::ShelfItemPtr item, 50 mash::shelf::mojom::ShelfItemPtr item,
51 mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override; 51 mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;
52 void UnpinItem(const mojo::String& app_id) override; 52 void UnpinItem(const mojo::String& app_id) override;
53 void SetItemImage(const mojo::String& app_id, 53 void SetItemImage(const mojo::String& app_id, const SkBitmap& image) override;
54 skia::mojom::BitmapPtr image) override;
55 54
56 // mash::wm::mojom::UserWindowObserver: 55 // mash::wm::mojom::UserWindowObserver:
57 void OnUserWindowObserverAdded( 56 void OnUserWindowObserverAdded(
58 mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) override; 57 mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) override;
59 void OnUserWindowAdded(mash::wm::mojom::UserWindowPtr user_window) override; 58 void OnUserWindowAdded(mash::wm::mojom::UserWindowPtr user_window) override;
60 void OnUserWindowRemoved(uint32_t window_id) override; 59 void OnUserWindowRemoved(uint32_t window_id) override;
61 void OnUserWindowTitleChanged(uint32_t window_id, 60 void OnUserWindowTitleChanged(uint32_t window_id,
62 const mojo::String& window_title) override; 61 const mojo::String& window_title) override;
63 void OnUserWindowAppIconChanged(uint32_t window_id, 62 void OnUserWindowAppIconChanged(uint32_t window_id,
64 mojo::Array<uint8_t> app_icon) override; 63 mojo::Array<uint8_t> app_icon) override;
(...skipping 14 matching lines...) Expand all
79 std::map<std::string, ShelfID> app_id_to_shelf_id_; 78 std::map<std::string, ShelfID> app_id_to_shelf_id_;
80 std::map<ShelfID, std::string> shelf_id_to_app_id_; 79 std::map<ShelfID, std::string> shelf_id_to_app_id_;
81 80
82 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); 81 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
83 }; 82 };
84 83
85 } // namespace sysui 84 } // namespace sysui
86 } // namespace ash 85 } // namespace ash
87 86
88 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_ 87 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698