Index: ui/aura/single_monitor_manager.cc |
diff --git a/ui/aura/single_monitor_manager.cc b/ui/aura/single_monitor_manager.cc |
index 479732760ce24829a3b76c638795fd1f66dbb7a6..6a05f06171ff04721f668b3828fedd63ef02a90f 100644 |
--- a/ui/aura/single_monitor_manager.cc |
+++ b/ui/aura/single_monitor_manager.cc |
@@ -8,9 +8,9 @@ |
#include "base/command_line.h" |
#include "ui/aura/aura_switches.h" |
-#include "ui/aura/monitor.h" |
#include "ui/aura/root_window.h" |
#include "ui/aura/root_window_host.h" |
+#include "ui/gfx/monitor.h" |
#include "ui/gfx/rect.h" |
namespace aura { |
@@ -36,16 +36,16 @@ SingleMonitorManager::~SingleMonitorManager() { |
} |
void SingleMonitorManager::OnNativeMonitorsChanged( |
- const std::vector<const Monitor*>& monitors) { |
+ const std::vector<const gfx::Monitor*>& monitors) { |
DCHECK(monitors.size() > 0); |
if (use_fullscreen_host_window()) { |
- monitor_->set_size(monitors[0]->bounds().size()); |
+ monitor_->SetSizeAndUpdateWorkArea(monitors[0]->bounds().size()); |
NotifyBoundsChanged(monitor_.get()); |
} |
} |
RootWindow* SingleMonitorManager::CreateRootWindowForMonitor( |
- Monitor* monitor) { |
+ gfx::Monitor* monitor) { |
DCHECK(!root_window_); |
DCHECK_EQ(monitor_.get(), monitor); |
root_window_ = new RootWindow(monitor->bounds()); |
@@ -53,25 +53,26 @@ RootWindow* SingleMonitorManager::CreateRootWindowForMonitor( |
return root_window_; |
} |
-const Monitor* SingleMonitorManager::GetMonitorNearestWindow( |
- const Window* window) const { |
- return monitor_.get(); |
+gfx::Monitor* SingleMonitorManager::GetMonitorAt(size_t index) { |
+ return !index ? monitor_.get() : NULL; |
} |
-const Monitor* SingleMonitorManager::GetMonitorNearestPoint( |
- const gfx::Point& point) const { |
- return monitor_.get(); |
+size_t SingleMonitorManager::GetNumMonitors() const { |
+ return 1; |
} |
-Monitor* SingleMonitorManager::GetMonitorAt(size_t index) { |
- return !index ? monitor_.get() : NULL; |
+const gfx::Monitor* SingleMonitorManager::GetMonitorNearestWindow( |
+ const Window* window) const { |
+ return monitor_.get(); |
} |
-size_t SingleMonitorManager::GetNumMonitors() const { |
- return 1; |
+gfx::Monitor* SingleMonitorManager::GetMonitorNearestWindow( |
+ const Window* window) { |
+ return monitor_.get(); |
} |
-Monitor* SingleMonitorManager::GetMonitorNearestWindow(const Window* window) { |
+const gfx::Monitor* SingleMonitorManager::GetMonitorNearestPoint( |
+ const gfx::Point& point) const { |
return monitor_.get(); |
} |
@@ -95,7 +96,7 @@ void SingleMonitorManager::Init() { |
} |
void SingleMonitorManager::Update(const gfx::Size size) { |
- monitor_->set_size(size); |
+ monitor_->SetSizeAndUpdateWorkArea(size); |
} |
} // namespace aura |