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