#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"
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; }
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,
const std::string& protocol,
const GURL& url,
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,
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,
// 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