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

Side by Side Diff: ash/common/shelf/shelf_widget.h

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 years, 10 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/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_widget.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_COMMON_SHELF_SHELF_WIDGET_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_
6 #define ASH_COMMON_SHELF_SHELF_WIDGET_H_ 6 #define ASH_COMMON_SHELF_SHELF_WIDGET_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // Returns the button that opens the app launcher. 89 // Returns the button that opens the app launcher.
90 AppListButton* GetAppListButton() const; 90 AppListButton* GetAppListButton() const;
91 91
92 // Returns the ApplicationDragAndDropHost for this shelf. 92 // Returns the ApplicationDragAndDropHost for this shelf.
93 app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList(); 93 app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
94 94
95 // Overridden from views::WidgetObserver: 95 // Overridden from views::WidgetObserver:
96 void OnWidgetActivationChanged(views::Widget* widget, bool active) override; 96 void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
97 97
98 // ShelfBackgroundAnimatorObserver overrides: 98 // ShelfBackgroundAnimatorObserver overrides:
99 void UpdateShelfItemBackground(int alpha) override; 99 void UpdateShelfItemBackground(SkColor color) override;
100 100
101 // ShelfLayoutManagerObserver overrides: 101 // ShelfLayoutManagerObserver overrides:
102 void WillDeleteShelfLayoutManager() override; 102 void WillDeleteShelfLayoutManager() override;
103 103
104 private: 104 private:
105 class DelegateView; 105 class DelegateView;
106 friend class DelegateView; 106 friend class DelegateView;
107 107
108 WmShelf* wm_shelf_; 108 WmShelf* wm_shelf_;
109 109
(...skipping 11 matching lines...) Expand all
121 ShelfView* shelf_view_; 121 ShelfView* shelf_view_;
122 ShelfBackgroundAnimator background_animator_; 122 ShelfBackgroundAnimator background_animator_;
123 bool activating_as_fallback_; 123 bool activating_as_fallback_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); 125 DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
126 }; 126 };
127 127
128 } // namespace ash 128 } // namespace ash
129 129
130 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_ 130 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698