Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / virtual_keyboard / virtual_keyboard_manager_impl.cc

diff --git a/src/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc b/src/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
index 7a9fdf6..7acca11 100644 (file)
--- a/src/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/src/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -32,10 +32,10 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
   BasicKeyboardControllerProxy(content::BrowserContext* context,
                                aura::Window* root_window)
       : browser_context_(context), root_window_(root_window) {}
-  virtual ~BasicKeyboardControllerProxy() {}
+  ~BasicKeyboardControllerProxy() override {}
 
   // keyboard::KeyboardControllerProxy:
-  virtual ui::InputMethod* GetInputMethod() OVERRIDE {
+  virtual ui::InputMethod* GetInputMethod() override {
     ui::InputMethod* input_method =
         root_window_->GetProperty(aura::client::kRootWindowInputMethodKey);
     return input_method;
@@ -44,13 +44,13 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
   virtual void RequestAudioInput(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE {}
+      const content::MediaResponseCallback& callback) override {}
 
-  virtual content::BrowserContext* GetBrowserContext() OVERRIDE {
+  virtual content::BrowserContext* GetBrowserContext() override {
     return browser_context_;
   }
 
-  virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE {}
+  virtual void SetUpdateInputType(ui::TextInputType type) override {}
 
  private:
   content::BrowserContext* browser_context_;
@@ -62,18 +62,17 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
 class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
  public:
   explicit VirtualKeyboardManagerImpl(content::BrowserContext* browser_context)
-      : browser_context_(browser_context),
-        container_(NULL) {
+      : browser_context_(browser_context), container_(nullptr) {
     CHECK(!instance);
     instance = this;
     Init();
   }
 
-  virtual ~VirtualKeyboardManagerImpl() {
+  ~VirtualKeyboardManagerImpl() override {
     CHECK_EQ(this, instance);
-    instance = NULL;
+    instance = nullptr;
 
-    keyboard::KeyboardController::ResetInstance(NULL);
+    keyboard::KeyboardController::ResetInstance(nullptr);
   }
 
  private: