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

Side by Side Diff: ash/shell.cc

Issue 10388141: Full-screen Magnifier: Support warping the cursor on the edge (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: review fix 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
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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // TODO(oshima): Move as many controllers before creating 408 // TODO(oshima): Move as many controllers before creating
409 // RootWindowController as possible. 409 // RootWindowController as possible.
410 stacking_controller_.reset(new internal::StackingController); 410 stacking_controller_.reset(new internal::StackingController);
411 visibility_controller_.reset(new internal::VisibilityController); 411 visibility_controller_.reset(new internal::VisibilityController);
412 drag_drop_controller_.reset(new internal::DragDropController); 412 drag_drop_controller_.reset(new internal::DragDropController);
413 if (delegate_.get()) 413 if (delegate_.get())
414 user_action_client_.reset(delegate_->CreateUserActionClient()); 414 user_action_client_.reset(delegate_->CreateUserActionClient());
415 window_modality_controller_.reset(new internal::WindowModalityController); 415 window_modality_controller_.reset(new internal::WindowModalityController);
416 AddEnvEventFilter(window_modality_controller_.get()); 416 AddEnvEventFilter(window_modality_controller_.get());
417 417
418 magnification_controller_.reset(new internal::MagnificationController); 418 magnification_controller_.reset(
419 internal::MagnificationController::CreateInstance());
420
419 high_contrast_controller_.reset(new HighContrastController); 421 high_contrast_controller_.reset(new HighContrastController);
420 video_detector_.reset(new VideoDetector); 422 video_detector_.reset(new VideoDetector);
421 window_cycle_controller_.reset(new WindowCycleController); 423 window_cycle_controller_.reset(new WindowCycleController);
422 424
423 InitRootWindowController(root_window_controller); 425 InitRootWindowController(root_window_controller);
424 426
425 // Initialize Primary RootWindow specific items. 427 // Initialize Primary RootWindow specific items.
426 status_area_widget_ = new internal::StatusAreaWidget(); 428 status_area_widget_ = new internal::StatusAreaWidget();
427 status_area_widget_->CreateTrayViews(delegate_.get()); 429 status_area_widget_->CreateTrayViews(delegate_.get());
428 status_area_widget_->Show(); 430 status_area_widget_->Show();
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 } 734 }
733 735
734 void Shell::ShowCursor(bool visible) { 736 void Shell::ShowCursor(bool visible) {
735 RootWindowList root_windows = GetAllRootWindows(); 737 RootWindowList root_windows = GetAllRootWindows();
736 for (RootWindowList::iterator iter = root_windows.begin(); 738 for (RootWindowList::iterator iter = root_windows.begin();
737 iter != root_windows.end(); ++iter) 739 iter != root_windows.end(); ++iter)
738 (*iter)->ShowCursor(visible); 740 (*iter)->ShowCursor(visible);
739 } 741 }
740 742
741 } // namespace ash 743 } // namespace ash
OLDNEW
« ash/magnifier/magnification_controller.h ('K') | « ash/magnifier/magnification_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698