| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/content/shell_content_state.h" | 5 #include "ash/content/shell_content_state.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "ui/keyboard/content/keyboard.h" | 8 #include "ui/keyboard/content/keyboard.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 } | 25 } |
| 26 | 26 |
| 27 // static | 27 // static |
| 28 void ShellContentState::DestroyInstance() { | 28 void ShellContentState::DestroyInstance() { |
| 29 DCHECK(instance_); | 29 DCHECK(instance_); |
| 30 delete instance_; | 30 delete instance_; |
| 31 instance_ = nullptr; | 31 instance_ = nullptr; |
| 32 } | 32 } |
| 33 | 33 |
| 34 ShellContentState::ShellContentState() { | 34 ShellContentState::ShellContentState() { |
| 35 // The keyboard system must be initialized before the RootWindowController is | 35 // The keyboard system must be initialized before the RootWindowController is |
| 36 // created. | 36 // created. |
| 37 #if defined(OS_CHROMEOS) | |
| 38 keyboard::InitializeKeyboard(); | 37 keyboard::InitializeKeyboard(); |
| 39 #endif | |
| 40 } | 38 } |
| 39 |
| 41 ShellContentState::~ShellContentState() {} | 40 ShellContentState::~ShellContentState() {} |
| 42 | 41 |
| 43 } // namespace ash | 42 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2618143002:
cros: Remove some OS platform ifdefs from ash (Closed)
