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

Side by Side Diff: ash/shell.cc

Issue 10540091: Rename gfx::Monitor to gfx::Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 #include "ash/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/focus_manager_factory.h" 10 #include "ash/accelerators/focus_manager_factory.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "ui/aura/focus_manager.h" 76 #include "ui/aura/focus_manager.h"
77 #include "ui/aura/layout_manager.h" 77 #include "ui/aura/layout_manager.h"
78 #include "ui/aura/monitor_manager.h" 78 #include "ui/aura/monitor_manager.h"
79 #include "ui/aura/root_window.h" 79 #include "ui/aura/root_window.h"
80 #include "ui/aura/shared/compound_event_filter.h" 80 #include "ui/aura/shared/compound_event_filter.h"
81 #include "ui/aura/shared/input_method_event_filter.h" 81 #include "ui/aura/shared/input_method_event_filter.h"
82 #include "ui/aura/ui_controls_aura.h" 82 #include "ui/aura/ui_controls_aura.h"
83 #include "ui/aura/window.h" 83 #include "ui/aura/window.h"
84 #include "ui/compositor/layer.h" 84 #include "ui/compositor/layer.h"
85 #include "ui/compositor/layer_animator.h" 85 #include "ui/compositor/layer_animator.h"
86 #include "ui/gfx/display.h"
86 #include "ui/gfx/image/image_skia.h" 87 #include "ui/gfx/image/image_skia.h"
87 #include "ui/gfx/monitor.h"
88 #include "ui/gfx/screen.h" 88 #include "ui/gfx/screen.h"
89 #include "ui/gfx/size.h" 89 #include "ui/gfx/size.h"
90 #include "ui/ui_controls/ui_controls.h" 90 #include "ui/ui_controls/ui_controls.h"
91 #include "ui/views/focus/focus_manager_factory.h" 91 #include "ui/views/focus/focus_manager_factory.h"
92 #include "ui/views/widget/native_widget_aura.h" 92 #include "ui/views/widget/native_widget_aura.h"
93 #include "ui/views/widget/widget.h" 93 #include "ui/views/widget/widget.h"
94 94
95 #if !defined(OS_MACOSX) 95 #if !defined(OS_MACOSX)
96 #include "ash/accelerators/accelerator_controller.h" 96 #include "ash/accelerators/accelerator_controller.h"
97 #include "ash/accelerators/accelerator_filter.h" 97 #include "ash/accelerators/accelerator_filter.h"
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 void Shell::SetCursor(gfx::NativeCursor cursor) { 1106 void Shell::SetCursor(gfx::NativeCursor cursor) {
1107 // TODO(oshima): set cursor to all root windows. 1107 // TODO(oshima): set cursor to all root windows.
1108 GetPrimaryRootWindow()->SetCursor(cursor); 1108 GetPrimaryRootWindow()->SetCursor(cursor);
1109 } 1109 }
1110 1110
1111 void Shell::ShowCursor(bool visible) { 1111 void Shell::ShowCursor(bool visible) {
1112 GetPrimaryRootWindow()->ShowCursor(visible); 1112 GetPrimaryRootWindow()->ShowCursor(visible);
1113 } 1113 }
1114 1114
1115 } // namespace ash 1115 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/test/ash_test_base.cc » ('j') | ui/gfx/screen.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698