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

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

Issue 2815043002: Removes ShellPort::IsRunningInMash() (Closed)
Patch Set: dont set instance_ in constructor Created 3 years, 8 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/accelerators/accelerator_filter_unittest.cc ('k') | ash/aura/shell_port_classic.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_SHELL_PORT_CLASSIC_H_ 5 #ifndef ASH_AURA_SHELL_PORT_CLASSIC_H_
6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_ 6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 16 matching lines...) Expand all
27 ~ShellPortClassic() override; 27 ~ShellPortClassic() override;
28 28
29 static ShellPortClassic* Get(); 29 static ShellPortClassic* Get();
30 30
31 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { 31 AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
32 return accelerator_controller_delegate_.get(); 32 return accelerator_controller_delegate_.get();
33 } 33 }
34 34
35 // ShellPort: 35 // ShellPort:
36 void Shutdown() override; 36 void Shutdown() override;
37 bool IsRunningInMash() const override;
38 Config GetAshConfig() const override; 37 Config GetAshConfig() const override;
39 WmWindow* GetPrimaryRootWindow() override; 38 WmWindow* GetPrimaryRootWindow() override;
40 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 39 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
41 const display::ManagedDisplayInfo& GetDisplayInfo( 40 const display::ManagedDisplayInfo& GetDisplayInfo(
42 int64_t display_id) const override; 41 int64_t display_id) const override;
43 bool IsActiveDisplayId(int64_t display_id) const override; 42 bool IsActiveDisplayId(int64_t display_id) const override;
44 display::Display GetFirstDisplay() const override; 43 display::Display GetFirstDisplay() const override;
45 bool IsInUnifiedMode() const override; 44 bool IsInUnifiedMode() const override;
46 bool IsInUnifiedModeIgnoreMirroring() const override; 45 bool IsInUnifiedModeIgnoreMirroring() const override;
47 void SetDisplayWorkAreaInsets(WmWindow* window, 46 void SetDisplayWorkAreaInsets(WmWindow* window,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 94
96 std::unique_ptr<AcceleratorControllerDelegateAura> 95 std::unique_ptr<AcceleratorControllerDelegateAura>
97 accelerator_controller_delegate_; 96 accelerator_controller_delegate_;
98 97
99 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic); 98 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic);
100 }; 99 };
101 100
102 } // namespace ash 101 } // namespace ash
103 102
104 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_ 103 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/aura/shell_port_classic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698