Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / app_window / app_window.h

diff --git a/src/extensions/browser/app_window/app_window.h b/src/extensions/browser/app_window/app_window.h
index 7cad2ab..5cbe8fa 100644 (file)
--- a/src/extensions/browser/app_window/app_window.h
+++ b/src/extensions/browser/app_window/app_window.h
@@ -150,6 +150,7 @@ class AppWindow : public content::NotificationObserver,
     SkColor active_frame_color;
     SkColor inactive_frame_color;
     bool alpha_enabled;
+    bool is_ime_window;
 
     // The initial content/inner bounds specification (excluding any window
     // decorations).
@@ -351,77 +352,70 @@ class AppWindow : public content::NotificationObserver,
   }
 
  protected:
-  virtual ~AppWindow();
+  ~AppWindow() override;
 
  private:
   // PlatformAppBrowserTest needs access to web_contents()
   friend class PlatformAppBrowserTest;
 
   // content::WebContentsDelegate implementation.
-  virtual void CloseContents(content::WebContents* contents) OVERRIDE;
-  virtual bool ShouldSuppressDialogs() OVERRIDE;
-  virtual content::ColorChooser* OpenColorChooser(
+  void CloseContents(content::WebContents* contents) override;
+  bool ShouldSuppressDialogs() override;
+  content::ColorChooser* OpenColorChooser(
       content::WebContents* web_contents,
       SkColor color,
-      const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE;
-  virtual void RunFileChooser(content::WebContents* tab,
-                              const content::FileChooserParams& params)
-      OVERRIDE;
-  virtual bool IsPopupOrPanel(const content::WebContents* source)
-      const OVERRIDE;
-  virtual void MoveContents(content::WebContents* source,
-                            const gfx::Rect& pos) OVERRIDE;
-  virtual void NavigationStateChanged(
-      const content::WebContents* source,
-      content::InvalidateTypes changed_flags) OVERRIDE;
-  virtual void ToggleFullscreenModeForTab(content::WebContents* source,
-                                          bool enter_fullscreen) OVERRIDE;
-  virtual bool IsFullscreenForTabOrPending(const content::WebContents* source)
-      const OVERRIDE;
-  virtual void RequestMediaAccessPermission(
+      const std::vector<content::ColorSuggestion>& suggestions) override;
+  void RunFileChooser(content::WebContents* tab,
+                      const content::FileChooserParams& params) override;
+  bool IsPopupOrPanel(const content::WebContents* source) const override;
+  void MoveContents(content::WebContents* source,
+                    const gfx::Rect& pos) override;
+  void NavigationStateChanged(const content::WebContents* source,
+                              content::InvalidateTypes changed_flags) override;
+  void ToggleFullscreenModeForTab(content::WebContents* source,
+                                  bool enter_fullscreen) override;
+  bool IsFullscreenForTabOrPending(
+      const content::WebContents* source) const override;
+  void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
-  virtual bool CheckMediaAccessPermission(
-      content::WebContents* web_contents,
-      const GURL& security_origin,
-      content::MediaStreamType type) OVERRIDE;
-  virtual content::WebContents* OpenURLFromTab(
+      const content::MediaResponseCallback& callback) override;
+  bool CheckMediaAccessPermission(content::WebContents* web_contents,
+                                  const GURL& security_origin,
+                                  content::MediaStreamType type) override;
+  content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
-  virtual void AddNewContents(content::WebContents* source,
-                              content::WebContents* new_contents,
-                              WindowOpenDisposition disposition,
-                              const gfx::Rect& initial_pos,
-                              bool user_gesture,
-                              bool* was_blocked) OVERRIDE;
-  virtual bool PreHandleKeyboardEvent(
+      const content::OpenURLParams& params) override;
+  void AddNewContents(content::WebContents* source,
+                      content::WebContents* new_contents,
+                      WindowOpenDisposition disposition,
+                      const gfx::Rect& initial_pos,
+                      bool user_gesture,
+                      bool* was_blocked) override;
+  bool PreHandleKeyboardEvent(content::WebContents* source,
+                              const content::NativeWebKeyboardEvent& event,
+                              bool* is_keyboard_shortcut) override;
+  void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event,
-      bool* is_keyboard_shortcut) OVERRIDE;
-  virtual void HandleKeyboardEvent(content::WebContents* source,
-                                   const content::NativeWebKeyboardEvent& event)
-      OVERRIDE;
-  virtual void RequestToLockMouse(content::WebContents* web_contents,
-                                  bool user_gesture,
-                                  bool last_unlocked_by_target) OVERRIDE;
-  virtual bool PreHandleGestureEvent(content::WebContents* source,
-                                     const blink::WebGestureEvent& event)
-      OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  void RequestToLockMouse(content::WebContents* web_contents,
+                          bool user_gesture,
+                          bool last_unlocked_by_target) override;
+  bool PreHandleGestureEvent(content::WebContents* source,
+                             const blink::WebGestureEvent& event) override;
 
   // content::WebContentsObserver implementation.
-  virtual void DidFirstVisuallyNonEmptyPaint() OVERRIDE;
+  void DidFirstVisuallyNonEmptyPaint() override;
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // web_modal::WebContentsModalDialogManagerDelegate implementation.
-  virtual void SetWebContentsBlocked(content::WebContents* web_contents,
-                                     bool blocked) OVERRIDE;
-  virtual bool IsWebContentsVisible(content::WebContents* web_contents)
-      OVERRIDE;
+  void SetWebContentsBlocked(content::WebContents* web_contents,
+                             bool blocked) override;
+  bool IsWebContentsVisible(content::WebContents* web_contents) override;
 
   // Saves the window geometry/position/screen bounds.
   void SaveWindowPosition();
@@ -456,8 +450,8 @@ class AppWindow : public content::NotificationObserver,
   void SendOnWindowShownIfShown();
 
   // web_modal::WebContentsModalDialogManagerDelegate implementation.
-  virtual web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
-      OVERRIDE;
+  web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
+      override;
 
   // Updates the badge to |image|. Called internally from the image loader
   // callback.
@@ -471,7 +465,7 @@ class AppWindow : public content::NotificationObserver,
                           const std::vector<gfx::Size>& original_bitmap_sizes);
 
   // IconImage::Observer implementation.
-  virtual void OnExtensionIconImageChanged(IconImage* image) OVERRIDE;
+  void OnExtensionIconImageChanged(IconImage* image) override;
 
   // The browser context with which this window is associated. AppWindow does
   // not own this object.