| OLD | NEW |
|---|
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/base/ime/input_method_base.h" | 5 #include "ui/base/ime/input_method_base.h" |
| 6 | 6 |
| 7 #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ | 7 #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ |
| 8 #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ | 8 #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ |
| 9 | 9 |
| 10 #include "base/macros.h" |
| 10 #include "ui/views/mus/mus_export.h" | 11 #include "ui/views/mus/mus_export.h" |
| 11 | 12 |
| 12 namespace mus { | 13 namespace mus { |
| 13 class Window; | 14 class Window; |
| 14 } // namespace mojo | 15 } // namespace mojo |
| 15 | 16 |
| 16 namespace views { | 17 namespace views { |
| 17 | 18 |
| 18 class VIEWS_MUS_EXPORT InputMethodMUS : public ui::InputMethodBase { | 19 class VIEWS_MUS_EXPORT InputMethodMUS : public ui::InputMethodBase { |
| 19 public: | 20 public: |
| (...skipping 23 matching lines...) Expand all Loading... |
| 43 | 44 |
| 44 // The toplevel window which is not owned by this class. | 45 // The toplevel window which is not owned by this class. |
| 45 mus::Window* window_; | 46 mus::Window* window_; |
| 46 | 47 |
| 47 DISALLOW_COPY_AND_ASSIGN(InputMethodMUS); | 48 DISALLOW_COPY_AND_ASSIGN(InputMethodMUS); |
| 48 }; | 49 }; |
| 49 | 50 |
| 50 } // namespace views | 51 } // namespace views |
| 51 | 52 |
| 52 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ | 53 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1543173002:
Switch to standard integer types in ui/views/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master