Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / browser_view.h

diff --git a/src/chrome/browser/ui/views/frame/browser_view.h b/src/chrome/browser/ui/views/frame/browser_view.h
index 06fcb0a..ef6aa46 100644 (file)
--- a/src/chrome/browser/ui/views/frame/browser_view.h
+++ b/src/chrome/browser/ui/views/frame/browser_view.h
@@ -50,6 +50,7 @@ class DownloadShelfView;
 class FullscreenExitBubbleViews;
 class InfoBarContainerView;
 class LocationBarView;
+class PermissionBubbleViewViews;
 class StatusBubbleViews;
 class SearchViewController;
 class TabStrip;
@@ -129,6 +130,11 @@ class BrowserView : public BrowserWindow,
   // to change some of the bubble's creation parameters.
   void InitStatusBubble();
 
+  // Initializes the permission bubble view. This class is intended to be
+  // created once and then re-used for the life of the browser window. The
+  // bubbles it creates will be associated with a single visible tab.
+  void InitPermissionBubbleView();
+
   // Returns the apparent bounds of the toolbar, in BrowserView coordinates.
   // These differ from |toolbar_.bounds()| in that they match where the toolbar
   // background image is drawn -- slightly outside the "true" bounds
@@ -323,11 +329,13 @@ class BrowserView : public BrowserWindow,
   virtual void ShowUpdateChromeDialog() OVERRIDE;
   virtual void ShowBookmarkBubble(const GURL& url,
                                   bool already_bookmarked) OVERRIDE;
+  virtual void ShowBookmarkAppBubble(
+      const WebApplicationInfo& web_app_info,
+      const std::string& extension_id) OVERRIDE;
   virtual void ShowBookmarkPrompt() OVERRIDE;
-  virtual void ShowTranslateBubble(
-      content::WebContents* contents,
-      TranslateBubbleModel::ViewState view_state,
-      TranslateErrors::Type error_type) 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,
@@ -666,6 +674,10 @@ class BrowserView : public BrowserWindow,
   // The Status information bubble that appears at the bottom of the window.
   scoped_ptr<StatusBubbleViews> status_bubble_;
 
+  // The permission bubble view is the toolkit-specific implementation of the
+  // interface used by the manager to display permissions bubbles.
+  scoped_ptr<PermissionBubbleViewViews> permission_bubble_view_;
+
   // A mapping between accelerators and commands.
   std::map<ui::Accelerator, int> accelerator_table_;