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

Side by Side Diff: ui/ozone/platform/caca/ozone_platform_caca.cc

Issue 742103002: Ozone keyboard layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lite-code
Patch Set: address review comments (spang) Created 6 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ozone/platform/caca/ozone_platform_caca.h" 5 #include "ui/ozone/platform/caca/ozone_platform_caca.h"
6 6
7 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
7 #include "ui/ozone/common/native_display_delegate_ozone.h" 9 #include "ui/ozone/common/native_display_delegate_ozone.h"
8 #include "ui/ozone/platform/caca/caca_event_source.h" 10 #include "ui/ozone/platform/caca/caca_event_source.h"
9 #include "ui/ozone/platform/caca/caca_window.h" 11 #include "ui/ozone/platform/caca/caca_window.h"
10 #include "ui/ozone/platform/caca/caca_window_manager.h" 12 #include "ui/ozone/platform/caca/caca_window_manager.h"
11 #include "ui/ozone/public/cursor_factory_ozone.h" 13 #include "ui/ozone/public/cursor_factory_ozone.h"
12 #include "ui/ozone/public/ozone_platform.h" 14 #include "ui/ozone/public/ozone_platform.h"
13 #include "ui/ozone/public/system_input_injector.h" 15 #include "ui/ozone/public/system_input_injector.h"
14 16
15 namespace ui { 17 namespace ui {
16 18
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 return caca_window.Pass(); 52 return caca_window.Pass();
51 } 53 }
52 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { 54 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
53 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone()); 55 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
54 } 56 }
55 57
56 void InitializeUI() override { 58 void InitializeUI() override {
57 window_manager_.reset(new CacaWindowManager); 59 window_manager_.reset(new CacaWindowManager);
58 event_source_.reset(new CacaEventSource()); 60 event_source_.reset(new CacaEventSource());
59 cursor_factory_ozone_.reset(new CursorFactoryOzone()); 61 cursor_factory_ozone_.reset(new CursorFactoryOzone());
62 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
63 make_scoped_ptr(new NoKeyboardLayoutEngine()));
60 } 64 }
61 65
62 void InitializeGPU() override {} 66 void InitializeGPU() override {}
63 67
64 private: 68 private:
65 scoped_ptr<CacaWindowManager> window_manager_; 69 scoped_ptr<CacaWindowManager> window_manager_;
66 scoped_ptr<CacaEventSource> event_source_; 70 scoped_ptr<CacaEventSource> event_source_;
67 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; 71 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
68 72
69 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); 73 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
70 }; 74 };
71 75
72 } // namespace 76 } // namespace
73 77
74 OzonePlatform* CreateOzonePlatformCaca() { return new OzonePlatformCaca; } 78 OzonePlatform* CreateOzonePlatformCaca() {
79 return new OzonePlatformCaca;
80 }
75 81
76 } // namespace ui 82 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698