Upstream version 10.38.220.0

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

diff --git a/src/chrome/browser/ui/browser.h b/src/chrome/browser/ui/browser.h
index 7172f5c..b9adfee 100644 (file)
--- a/src/chrome/browser/ui/browser.h
+++ b/src/chrome/browser/ui/browser.h
@@ -32,7 +32,7 @@
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
 #include "chrome/common/content_settings.h"
-#include "chrome/common/content_settings_types.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/page_navigator.h"
@@ -349,9 +349,6 @@ class Browser : public TabStripModelObserver,
   // fullscreen.
   void WindowFullscreenStateChanged();
 
-  // Invoked when visible SSL state (as defined by SSLStatus) changes.
-  void VisibleSSLStateChanged(content::WebContents* web_contents);
-
   // Assorted browser commands ////////////////////////////////////////////////
 
   // NOTE: Within each of the following sections, the IDs are ordered roughly by
@@ -449,6 +446,10 @@ class Browser : public TabStripModelObserver,
   virtual bool PreHandleGestureEvent(
       content::WebContents* source,
       const blink::WebGestureEvent& event) OVERRIDE;
+  virtual bool CanDragEnter(
+      content::WebContents* source,
+      const content::DropData& data,
+      blink::WebDragOperationsMask operations_allowed) OVERRIDE;
 
   bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
   bool is_type_popup() const { return type_ == TYPE_POPUP; }
@@ -535,8 +536,11 @@ class Browser : public TabStripModelObserver,
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
-  virtual void NavigationStateChanged(const content::WebContents* source,
-                                      unsigned changed_flags) OVERRIDE;
+  virtual void NavigationStateChanged(
+      const content::WebContents* source,
+      content::InvalidateTypes changed_flags) OVERRIDE;
+  virtual void VisibleSSLStateChanged(
+      const content::WebContents* source) OVERRIDE;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
@@ -616,8 +620,11 @@ class Browser : public TabStripModelObserver,
   virtual void RegisterProtocolHandler(content::WebContents* web_contents,
                                        const std::string& protocol,
                                        const GURL& url,
-                                       const base::string16& title,
                                        bool user_gesture) OVERRIDE;
+  virtual void UnregisterProtocolHandler(content::WebContents* web_contents,
+                                         const std::string& protocol,
+                                         const GURL& url,
+                                         bool user_gesture) OVERRIDE;
   virtual void UpdatePreferredSize(content::WebContents* source,
                                    const gfx::Size& pref_size) OVERRIDE;
   virtual void ResizeDueToAutoResize(content::WebContents* source,
@@ -680,8 +687,8 @@ class Browser : public TabStripModelObserver,
                                  bool starred) OVERRIDE;
 
   // Overridden from ZoomObserver:
-  virtual void OnZoomChanged(content::WebContents* source,
-                             bool can_show_bubble) OVERRIDE;
+  virtual void OnZoomChanged(
+      const ZoomController::ZoomChangedEventData& data) OVERRIDE;
 
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const base::FilePath& path,
@@ -756,8 +763,10 @@ class Browser : public TabStripModelObserver,
   // Assorted utility functions ///////////////////////////////////////////////
 
   // Sets the specified browser as the delegate of the WebContents and all the
-  // associated tab helpers that are needed.
-  void SetAsDelegate(content::WebContents* web_contents, Browser* delegate);
+  // associated tab helpers that are needed. If |set_delegate| is true, this
+  // browser object is set as a delegate for |web_contents| components, else
+  // is is removed as a delegate.
+  void SetAsDelegate(content::WebContents* web_contents, bool set_delegate);
 
   // Shows the Find Bar, optionally selecting the next entry that matches the
   // existing search string for that Tab. |forward_direction| controls the