Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / gtk / browser_window_gtk.h

diff --git a/src/chrome/browser/ui/gtk/browser_window_gtk.h b/src/chrome/browser/ui/gtk/browser_window_gtk.h
index 6185654..cc064bd 100644 (file)
--- a/src/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/src/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -137,10 +137,12 @@ class BrowserWindowGtk
   virtual void ShowUpdateChromeDialog() OVERRIDE;
   virtual void ShowBookmarkBubble(const GURL& url,
                                   bool already_bookmarked) OVERRIDE;
-  virtual void ShowTranslateBubble(
-      content::WebContents* contents,
-      TranslateBubbleModel::ViewState view_state,
-      TranslateErrors::Type error_type) OVERRIDE;
+  virtual void ShowBookmarkAppBubble(
+      const WebApplicationInfo& web_app_info,
+      const std::string& extension_id) OVERRIDE;
+  virtual void ShowTranslateBubble(content::WebContents* contents,
+                                   TranslateTabHelper::TranslateStep step,
+                                   TranslateErrors::Type error_type) OVERRIDE;
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   virtual void ShowOneClickSigninBubble(
       OneClickSigninBubbleType type,
@@ -530,9 +532,9 @@ class BrowserWindowGtk
   // or is inspected with undocked version of DevToolsWindow.
   DevToolsWindow* devtools_window_;
 
-  // Insets from the sides of devtools_floating_container_ to the sides of
-  // contents_container_. Non-zero only if docked devtools is visible.
-  gfx::Insets contents_insets_;
+  // Resizing strategy of contents_container_ inside
+  // devtools_floating_container_. Non-empty only if docked devtools is visible.
+  DevToolsContentsResizingStrategy contents_resizing_strategy_;
 
   // Floating container for devtools_container_ and contents_container_.
   // Owned by render_area_vbox_.