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

Side by Side Diff: ash/monitor/multi_monitor_manager.h

Issue 9835068: Don't delete Primary root window and monitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MONITOR_MULTI_MONITOR_MANAGER_H_ 5 #ifndef ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
6 #define ASH_MONITOR_MULTI_MONITOR_MANAGER_H_ 6 #define ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 private: 59 private:
60 typedef std::vector<aura::Monitor*> Monitors; 60 typedef std::vector<aura::Monitor*> Monitors;
61 61
62 void Init(); 62 void Init();
63 void AddRemoveMonitorImpl(); 63 void AddRemoveMonitorImpl();
64 void CycleMonitorImpl(); 64 void CycleMonitorImpl();
65 65
66 Monitors monitors_; 66 Monitors monitors_;
67 67
68 // We keep the primary root window so that when # of montor goes zero,
69 // we don't delete it.
70 aura::RootWindow* primary_root_window_;
Daniel Erat 2012/03/23 23:49:48 nit: you're not using this, are you?
oshima 2012/03/24 00:17:50 This file was supposed to be reverted, my bad. Don
71
68 DISALLOW_COPY_AND_ASSIGN(MultiMonitorManager); 72 DISALLOW_COPY_AND_ASSIGN(MultiMonitorManager);
69 }; 73 };
70 74
71 extern const aura::WindowProperty<aura::Monitor*>* const kMonitorKey; 75 extern const aura::WindowProperty<aura::Monitor*>* const kMonitorKey;
72 76
73 } // namespace internal 77 } // namespace internal
74 } // namespace ash 78 } // namespace ash
75 79
76 #endif // ASH_MONITOR_MULTI_MONITOR_MANAGER_H_ 80 #endif // ASH_MONITOR_MULTI_MONITOR_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698