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

Side by Side Diff: ash/common/wm_window.h

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 years, 1 month 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_COMMON_WM_WINDOW_H_ 5 #ifndef ASH_COMMON_WM_WINDOW_H_
6 #define ASH_COMMON_WM_WINDOW_H_ 6 #define ASH_COMMON_WM_WINDOW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/base/ui_base_types.h" 15 #include "ui/base/ui_base_types.h"
16 #include "ui/compositor/layer_animation_element.h" 16 #include "ui/compositor/layer_animation_element.h"
17 #include "ui/gfx/image/image_skia.h"
17 #include "ui/wm/core/window_animations.h" 18 #include "ui/wm/core/window_animations.h"
18 #include "ui/wm/public/window_types.h" 19 #include "ui/wm/public/window_types.h"
19 20
20 namespace display { 21 namespace display {
21 class Display; 22 class Display;
22 } 23 }
23 24
24 namespace gfx { 25 namespace gfx {
25 class Point; 26 class Point;
26 class Rect; 27 class Rect;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 virtual gfx::Transform GetTargetTransform() const = 0; 132 virtual gfx::Transform GetTargetTransform() const = 0;
132 133
133 virtual bool IsSystemModal() const = 0; 134 virtual bool IsSystemModal() const = 0;
134 135
135 virtual bool GetBoolProperty(WmWindowProperty key) = 0; 136 virtual bool GetBoolProperty(WmWindowProperty key) = 0;
136 virtual SkColor GetColorProperty(WmWindowProperty key) = 0; 137 virtual SkColor GetColorProperty(WmWindowProperty key) = 0;
137 virtual void SetColorProperty(WmWindowProperty key, SkColor value) = 0; 138 virtual void SetColorProperty(WmWindowProperty key, SkColor value) = 0;
138 virtual int GetIntProperty(WmWindowProperty key) = 0; 139 virtual int GetIntProperty(WmWindowProperty key) = 0;
139 virtual void SetIntProperty(WmWindowProperty key, int value) = 0; 140 virtual void SetIntProperty(WmWindowProperty key, int value) = 0;
140 141
142 virtual gfx::ImageSkia GetWindowIcon() = 0;
143 virtual gfx::ImageSkia GetAppIcon() = 0;
144
141 wm::WindowState* GetWindowState() { 145 wm::WindowState* GetWindowState() {
142 return const_cast<wm::WindowState*>( 146 return const_cast<wm::WindowState*>(
143 const_cast<const WmWindow*>(this)->GetWindowState()); 147 const_cast<const WmWindow*>(this)->GetWindowState());
144 } 148 }
145 virtual const wm::WindowState* GetWindowState() const = 0; 149 virtual const wm::WindowState* GetWindowState() const = 0;
146 150
147 // The implementation of this matches aura::Window::GetToplevelWindow(). 151 // The implementation of this matches aura::Window::GetToplevelWindow().
148 virtual WmWindow* GetToplevelWindow() = 0; 152 virtual WmWindow* GetToplevelWindow() = 0;
149 // The implementation of this matches 153 // The implementation of this matches
150 // aura::client::ActivationClient::GetToplevelWindow(). 154 // aura::client::ActivationClient::GetToplevelWindow().
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 virtual void AddLimitedPreTargetHandler(ui::EventHandler* handler) = 0; 334 virtual void AddLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
331 virtual void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) = 0; 335 virtual void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
332 336
333 protected: 337 protected:
334 virtual ~WmWindow() {} 338 virtual ~WmWindow() {}
335 }; 339 };
336 340
337 } // namespace ash 341 } // namespace ash
338 342
339 #endif // ASH_COMMON_WM_WINDOW_H_ 343 #endif // ASH_COMMON_WM_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698