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

Side by Side Diff: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 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 | « athena/util/fill_layout_manager.h ('k') | athena/wm/bezel_controller.h » ('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 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 "athena/virtual_keyboard/public/virtual_keyboard_manager.h" 5 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
6 6
7 #include "athena/screen/public/screen_manager.h" 7 #include "athena/screen/public/screen_manager.h"
8 #include "athena/util/container_priorities.h" 8 #include "athena/util/container_priorities.h"
9 #include "athena/util/fill_layout_manager.h" 9 #include "athena/util/fill_layout_manager.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 14 matching lines...) Expand all
25 namespace { 25 namespace {
26 26
27 VirtualKeyboardManager* instance; 27 VirtualKeyboardManager* instance;
28 28
29 // A very basic and simple implementation of KeyboardControllerProxy. 29 // A very basic and simple implementation of KeyboardControllerProxy.
30 class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy { 30 class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
31 public: 31 public:
32 BasicKeyboardControllerProxy(content::BrowserContext* context, 32 BasicKeyboardControllerProxy(content::BrowserContext* context,
33 aura::Window* root_window) 33 aura::Window* root_window)
34 : browser_context_(context), root_window_(root_window) {} 34 : browser_context_(context), root_window_(root_window) {}
35 virtual ~BasicKeyboardControllerProxy() {} 35 ~BasicKeyboardControllerProxy() override {}
36 36
37 // keyboard::KeyboardControllerProxy: 37 // keyboard::KeyboardControllerProxy:
38 virtual ui::InputMethod* GetInputMethod() override { 38 virtual ui::InputMethod* GetInputMethod() override {
39 ui::InputMethod* input_method = 39 ui::InputMethod* input_method =
40 root_window_->GetProperty(aura::client::kRootWindowInputMethodKey); 40 root_window_->GetProperty(aura::client::kRootWindowInputMethodKey);
41 return input_method; 41 return input_method;
42 } 42 }
43 43
44 virtual void RequestAudioInput( 44 virtual void RequestAudioInput(
45 content::WebContents* web_contents, 45 content::WebContents* web_contents,
(...skipping 15 matching lines...) Expand all
61 61
62 class VirtualKeyboardManagerImpl : public VirtualKeyboardManager { 62 class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
63 public: 63 public:
64 explicit VirtualKeyboardManagerImpl(content::BrowserContext* browser_context) 64 explicit VirtualKeyboardManagerImpl(content::BrowserContext* browser_context)
65 : browser_context_(browser_context), container_(nullptr) { 65 : browser_context_(browser_context), container_(nullptr) {
66 CHECK(!instance); 66 CHECK(!instance);
67 instance = this; 67 instance = this;
68 Init(); 68 Init();
69 } 69 }
70 70
71 virtual ~VirtualKeyboardManagerImpl() { 71 ~VirtualKeyboardManagerImpl() override {
72 CHECK_EQ(this, instance); 72 CHECK_EQ(this, instance);
73 instance = nullptr; 73 instance = nullptr;
74 74
75 keyboard::KeyboardController::ResetInstance(nullptr); 75 keyboard::KeyboardController::ResetInstance(nullptr);
76 } 76 }
77 77
78 private: 78 private:
79 void Init() { 79 void Init() {
80 athena::ScreenManager::ContainerParams params("VirtualKeyboardContainer", 80 athena::ScreenManager::ContainerParams params("VirtualKeyboardContainer",
81 CP_VIRTUAL_KEYBOARD); 81 CP_VIRTUAL_KEYBOARD);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 return instance; 117 return instance;
118 } 118 }
119 119
120 void VirtualKeyboardManager::Shutdown() { 120 void VirtualKeyboardManager::Shutdown() {
121 CHECK(instance); 121 CHECK(instance);
122 delete instance; 122 delete instance;
123 CHECK(!instance); 123 CHECK(!instance);
124 } 124 }
125 125
126 } // namespace athena 126 } // namespace athena
OLDNEW
« no previous file with comments | « athena/util/fill_layout_manager.h ('k') | athena/wm/bezel_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698