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

Side by Side Diff: extensions/shell/browser/shell_desktop_controller_aura.h

Issue 1019623002: Remove DisplayState from the public interface for DisplayConfigurator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 aura::Window* window, 80 aura::Window* window,
81 const gfx::Rect& bounds) override; 81 const gfx::Rect& bounds) override;
82 82
83 #if defined(OS_CHROMEOS) 83 #if defined(OS_CHROMEOS)
84 // chromeos::PowerManagerClient::Observer overrides: 84 // chromeos::PowerManagerClient::Observer overrides:
85 void PowerButtonEventReceived(bool down, 85 void PowerButtonEventReceived(bool down,
86 const base::TimeTicks& timestamp) override; 86 const base::TimeTicks& timestamp) override;
87 87
88 // ui::DisplayConfigurator::Observer overrides. 88 // ui::DisplayConfigurator::Observer overrides.
89 void OnDisplayModeChanged( 89 void OnDisplayModeChanged(
90 const std::vector<ui::DisplayConfigurator::DisplayState>& displays) 90 const ui::DisplayConfigurator::DisplayStateList& displays) override;
91 override;
92 #endif 91 #endif
93 92
94 // aura::WindowTreeHostObserver overrides: 93 // aura::WindowTreeHostObserver overrides:
95 void OnHostCloseRequested(const aura::WindowTreeHost* host) override; 94 void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
96 95
97 protected: 96 protected:
98 // Creates and sets the aura clients and window manager stuff. Subclass may 97 // Creates and sets the aura clients and window manager stuff. Subclass may
99 // initialize different sets of the clients. 98 // initialize different sets of the clients.
100 virtual void InitWindowManager(); 99 virtual void InitWindowManager();
101 100
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 136
138 // NativeAppWindow::Close() deletes the AppWindow. 137 // NativeAppWindow::Close() deletes the AppWindow.
139 std::vector<AppWindow*> app_windows_; 138 std::vector<AppWindow*> app_windows_;
140 139
141 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); 140 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura);
142 }; 141 };
143 142
144 } // namespace extensions 143 } // namespace extensions
145 144
146 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ 145 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
OLDNEW
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | extensions/shell/browser/shell_desktop_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698