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

Side by Side Diff: ash/aura/wm_root_window_controller_aura.h

Issue 2350953009: Centralizes more shared code between ash and mash (Closed)
Patch Set: feedback Created 4 years, 3 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/aura/wm_root_window_controller_aura.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_AURA_WM_ROOT_CONTROLLER_AURA_H_ 5 #ifndef ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
6 #define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_ 6 #define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/wm_root_window_controller.h" 9 #include "ash/common/wm_root_window_controller.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 14 matching lines...) Expand all
25 25
26 static WmRootWindowControllerAura* Get(aura::Window* window) { 26 static WmRootWindowControllerAura* Get(aura::Window* window) {
27 return const_cast<WmRootWindowControllerAura*>( 27 return const_cast<WmRootWindowControllerAura*>(
28 Get(const_cast<const aura::Window*>(window))); 28 Get(const_cast<const aura::Window*>(window)));
29 } 29 }
30 static const WmRootWindowControllerAura* Get(const aura::Window* window); 30 static const WmRootWindowControllerAura* Get(const aura::Window* window);
31 31
32 // WmRootWindowController: 32 // WmRootWindowController:
33 bool HasShelf() override; 33 bool HasShelf() override;
34 WmShell* GetShell() override; 34 WmShell* GetShell() override;
35 AlwaysOnTopController* GetAlwaysOnTopController() override;
36 WmShelf* GetShelf() override; 35 WmShelf* GetShelf() override;
37 WmWindow* GetWindow() override; 36 WmWindow* GetWindow() override;
38 void ConfigureWidgetInitParamsForContainer( 37 void ConfigureWidgetInitParamsForContainer(
39 views::Widget* widget, 38 views::Widget* widget,
40 int shell_container_id, 39 int shell_container_id,
41 views::Widget::InitParams* init_params) override; 40 views::Widget::InitParams* init_params) override;
42 WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override; 41 WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override;
43 gfx::Point GetLastMouseLocationInRoot() override; 42 gfx::Point GetLastMouseLocationInRoot() override;
44 void OnInitialWallpaperAnimationStarted() override; 43 void OnInitialWallpaperAnimationStarted() override;
45 void OnWallpaperAnimationFinished(views::Widget* widget) override; 44 void OnWallpaperAnimationFinished(views::Widget* widget) override;
46 45
46 protected:
47 // WmRootWindowController:
48 bool ShouldDestroyWindowInCloseChildWindows(WmWindow* window) override;
49
47 private: 50 private:
48 friend class RootWindowController; 51 friend class RootWindowController;
49 52
50 RootWindowController* root_window_controller_; 53 RootWindowController* root_window_controller_;
51 54
52 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura); 55 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura);
53 }; 56 };
54 57
55 } // namespace ash 58 } // namespace ash
56 59
57 #endif // ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_ 60 #endif // ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698