| 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 "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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 if (command_line->HasSwitch(ash::switches::kAshNewLockAnimationsEnabled)) | 545 if (command_line->HasSwitch(ash::switches::kAshNewLockAnimationsEnabled)) |
| 546 session_state_controller_.reset(new SessionStateControllerImpl2); | 546 session_state_controller_.reset(new SessionStateControllerImpl2); |
| 547 else | 547 else |
| 548 session_state_controller_.reset(new SessionStateControllerImpl); | 548 session_state_controller_.reset(new SessionStateControllerImpl); |
| 549 power_button_controller_.reset(new PowerButtonController( | 549 power_button_controller_.reset(new PowerButtonController( |
| 550 session_state_controller_.get())); | 550 session_state_controller_.get())); |
| 551 AddShellObserver(session_state_controller_.get()); | 551 AddShellObserver(session_state_controller_.get()); |
| 552 | 552 |
| 553 if (initially_hide_cursor_) | 553 if (initially_hide_cursor_) |
| 554 cursor_manager_.ShowCursor(false); | 554 cursor_manager_.ShowCursor(false); |
| 555 cursor_manager_.SetCursor(ui::kCursorPointer); |
| 555 | 556 |
| 556 // Cursor might have been hidden by somethign other than chrome. | 557 // Cursor might have been hidden by somethign other than chrome. |
| 557 // Let the first mouse event show the cursor. | 558 // Let the first mouse event show the cursor. |
| 558 env_filter_->set_cursor_hidden_by_filter(true); | 559 env_filter_->set_cursor_hidden_by_filter(true); |
| 559 } | 560 } |
| 560 | 561 |
| 561 void Shell::ShowContextMenu(const gfx::Point& location_in_screen) { | 562 void Shell::ShowContextMenu(const gfx::Point& location_in_screen) { |
| 562 // No context menus if user have not logged in. | 563 // No context menus if user have not logged in. |
| 563 if (!delegate_->IsUserLoggedIn()) | 564 if (!delegate_->IsUserLoggedIn()) |
| 564 return; | 565 return; |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 857 | 858 |
| 858 bool Shell::CanAcceptEvents() { | 859 bool Shell::CanAcceptEvents() { |
| 859 return true; | 860 return true; |
| 860 } | 861 } |
| 861 | 862 |
| 862 ui::EventTarget* Shell::GetParentTarget() { | 863 ui::EventTarget* Shell::GetParentTarget() { |
| 863 return NULL; | 864 return NULL; |
| 864 } | 865 } |
| 865 | 866 |
| 866 } // namespace ash | 867 } // namespace ash |
| OLD | NEW |