| 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 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 DISALLOW_COPY_AND_ASSIGN(AshVisibilityController); | 167 DISALLOW_COPY_AND_ASSIGN(AshVisibilityController); |
| 168 }; | 168 }; |
| 169 | 169 |
| 170 } // namespace | 170 } // namespace |
| 171 | 171 |
| 172 // static | 172 // static |
| 173 Shell* Shell::instance_ = nullptr; | 173 Shell* Shell::instance_ = nullptr; |
| 174 // static | 174 // static |
| 175 aura::WindowTreeClient* Shell::window_tree_client_ = nullptr; | 175 aura::WindowTreeClient* Shell::window_tree_client_ = nullptr; |
| 176 // static | 176 // static |
| 177 aura::WindowManagerClient* Shell::window_manager_client_ = nullptr; |
| 178 // static |
| 177 bool Shell::initially_hide_cursor_ = false; | 179 bool Shell::initially_hide_cursor_ = false; |
| 178 | 180 |
| 179 //////////////////////////////////////////////////////////////////////////////// | 181 //////////////////////////////////////////////////////////////////////////////// |
| 180 // Shell, public: | 182 // Shell, public: |
| 181 | 183 |
| 182 // static | 184 // static |
| 183 Shell* Shell::CreateInstance(const ShellInitParams& init_params) { | 185 Shell* Shell::CreateInstance(const ShellInitParams& init_params) { |
| 184 CHECK(!instance_); | 186 CHECK(!instance_); |
| 185 instance_ = new Shell(init_params.delegate); | 187 instance_ = new Shell(init_params.delegate); |
| 186 instance_->Init(init_params); | 188 instance_->Init(init_params); |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 855 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 857 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 856 return std::unique_ptr<ui::EventTargetIterator>(); | 858 return std::unique_ptr<ui::EventTargetIterator>(); |
| 857 } | 859 } |
| 858 | 860 |
| 859 ui::EventTargeter* Shell::GetEventTargeter() { | 861 ui::EventTargeter* Shell::GetEventTargeter() { |
| 860 NOTREACHED(); | 862 NOTREACHED(); |
| 861 return nullptr; | 863 return nullptr; |
| 862 } | 864 } |
| 863 | 865 |
| 864 } // namespace ash | 866 } // namespace ash |
| OLD | NEW |