OLD | NEW |
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 #include "ui/aura/display_manager.h" | 5 #include "ui/aura/display_manager.h" |
6 | 6 |
7 #include <stdio.h> | 7 #include <stdio.h> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "ui/aura/display_observer.h" | 10 #include "ui/aura/display_observer.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 gfx::Display display(synthesized_display_id++); | 44 gfx::Display display(synthesized_display_id++); |
45 display.SetScaleAndBounds(scale, bounds); | 45 display.SetScaleAndBounds(scale, bounds); |
46 DVLOG(1) << "Display bounds=" << bounds.ToString() << ", scale=" << scale; | 46 DVLOG(1) << "Display bounds=" << bounds.ToString() << ", scale=" << scale; |
47 return display; | 47 return display; |
48 } | 48 } |
49 | 49 |
50 // static | 50 // static |
51 RootWindow* DisplayManager::CreateRootWindowForPrimaryDisplay() { | 51 RootWindow* DisplayManager::CreateRootWindowForPrimaryDisplay() { |
52 DisplayManager* manager = aura::Env::GetInstance()->display_manager(); | 52 DisplayManager* manager = aura::Env::GetInstance()->display_manager(); |
53 RootWindow* root = | 53 RootWindow* root = |
54 manager->CreateRootWindowForDisplay(manager->GetDisplayAt(0)); | 54 manager->CreateRootWindowForDisplay(*manager->GetDisplayAt(0)); |
55 if (use_fullscreen_host_window_) | 55 if (use_fullscreen_host_window_) |
56 root->ConfineCursorToWindow(); | 56 root->ConfineCursorToWindow(); |
57 return root; | 57 return root; |
58 } | 58 } |
59 | 59 |
60 DisplayManager::DisplayManager() { | 60 DisplayManager::DisplayManager() { |
61 } | 61 } |
62 | 62 |
63 DisplayManager::~DisplayManager() { | 63 DisplayManager::~DisplayManager() { |
64 } | 64 } |
(...skipping 13 matching lines...) Expand all Loading... |
78 | 78 |
79 void DisplayManager::NotifyDisplayAdded(const gfx::Display& display) { | 79 void DisplayManager::NotifyDisplayAdded(const gfx::Display& display) { |
80 FOR_EACH_OBSERVER(DisplayObserver, observers_, OnDisplayAdded(display)); | 80 FOR_EACH_OBSERVER(DisplayObserver, observers_, OnDisplayAdded(display)); |
81 } | 81 } |
82 | 82 |
83 void DisplayManager::NotifyDisplayRemoved(const gfx::Display& display) { | 83 void DisplayManager::NotifyDisplayRemoved(const gfx::Display& display) { |
84 FOR_EACH_OBSERVER(DisplayObserver, observers_, OnDisplayRemoved(display)); | 84 FOR_EACH_OBSERVER(DisplayObserver, observers_, OnDisplayRemoved(display)); |
85 } | 85 } |
86 | 86 |
87 } // namespace aura | 87 } // namespace aura |
OLD | NEW |