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

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

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: cleanup Created 3 years, 11 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_AURA_WM_WINDOW_AURA_H_ 5 #ifndef ASH_AURA_WM_WINDOW_AURA_H_
6 #define ASH_AURA_WM_WINDOW_AURA_H_ 6 #define ASH_AURA_WM_WINDOW_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 aura::Window* aura_window() { return window_; } 47 aura::Window* aura_window() { return window_; }
48 const aura::Window* aura_window() const { return window_; } 48 const aura::Window* aura_window() const { return window_; }
49 49
50 // See description of |children_use_extended_hit_region_|. 50 // See description of |children_use_extended_hit_region_|.
51 bool ShouldUseExtendedHitRegion() const; 51 bool ShouldUseExtendedHitRegion() const;
52 52
53 // WmWindow: 53 // WmWindow:
54 void Destroy() override; 54 void Destroy() override;
55 const WmWindow* GetRootWindow() const override; 55 const WmWindow* GetRootWindow() const override;
56 WmRootWindowController* GetRootWindowController() override; 56 RootWindowController* GetRootWindowController() override;
57 WmShell* GetShell() const override; 57 WmShell* GetShell() const override;
58 void SetName(const char* name) override; 58 void SetName(const char* name) override;
59 std::string GetName() const override; 59 std::string GetName() const override;
60 void SetTitle(const base::string16& title) override; 60 void SetTitle(const base::string16& title) override;
61 base::string16 GetTitle() const override; 61 base::string16 GetTitle() const override;
62 void SetShellWindowId(int id) override; 62 void SetShellWindowId(int id) override;
63 int GetShellWindowId() const override; 63 int GetShellWindowId() const override;
64 WmWindow* GetChildByShellWindowId(int id) override; 64 WmWindow* GetChildByShellWindowId(int id) override;
65 ui::wm::WindowType GetType() const override; 65 ui::wm::WindowType GetType() const override;
66 int GetAppType() const override; 66 int GetAppType() const override;
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 241
242 // If true the minimum size is 0x0, default is minimum size comes from widget. 242 // If true the minimum size is 0x0, default is minimum size comes from widget.
243 bool use_empty_minimum_size_for_testing_; 243 bool use_empty_minimum_size_for_testing_;
244 244
245 DISALLOW_COPY_AND_ASSIGN(WmWindowAura); 245 DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
246 }; 246 };
247 247
248 } // namespace ash 248 } // namespace ash
249 249
250 #endif // ASH_AURA_WM_WINDOW_AURA_H_ 250 #endif // ASH_AURA_WM_WINDOW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698