Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Side by Side Diff: ui/views/mus/input_method_mus.h

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/mus/clipboard_mus.cc ('k') | ui/views/mus/screen_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/macros.h"
11 #include "mojo/public/cpp/bindings/strong_binding.h" 11 #include "mojo/public/cpp/bindings/strong_binding.h"
12 #include "services/shell/public/cpp/connector.h" 12 #include "services/service_manager/public/cpp/connector.h"
13 #include "services/ui/public/interfaces/ime.mojom.h" 13 #include "services/ui/public/interfaces/ime.mojom.h"
14 #include "ui/views/mus/mus_export.h" 14 #include "ui/views/mus/mus_export.h"
15 15
16 namespace ui { 16 namespace ui {
17 class Window; 17 class Window;
18 } // namespace mojo 18 } // namespace mojo
19 19
20 namespace views { 20 namespace views {
21 21
22 class TextInputClientImpl; 22 class TextInputClientImpl;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ui::mojom::IMEServerPtr ime_server_; 57 ui::mojom::IMEServerPtr ime_server_;
58 ui::mojom::InputMethodPtr input_method_; 58 ui::mojom::InputMethodPtr input_method_;
59 std::unique_ptr<TextInputClientImpl> text_input_client_; 59 std::unique_ptr<TextInputClientImpl> text_input_client_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(InputMethodMus); 61 DISALLOW_COPY_AND_ASSIGN(InputMethodMus);
62 }; 62 };
63 63
64 } // namespace views 64 } // namespace views
65 65
66 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ 66 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/clipboard_mus.cc ('k') | ui/views/mus/screen_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698