OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 virtual void Paste() override; | 356 virtual void Paste() override; |
357 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 357 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
358 const gfx::Rect& bounds) override; | 358 const gfx::Rect& bounds) override; |
359 virtual FindBar* CreateFindBar() override; | 359 virtual FindBar* CreateFindBar() override; |
360 virtual web_modal::WebContentsModalDialogHost* | 360 virtual web_modal::WebContentsModalDialogHost* |
361 GetWebContentsModalDialogHost() override; | 361 GetWebContentsModalDialogHost() override; |
362 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 362 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
363 const gfx::Rect& rect) override; | 363 const gfx::Rect& rect) override; |
364 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, | 364 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, |
365 const signin::ManageAccountsParams& manage_accounts_params) override; | 365 const signin::ManageAccountsParams& manage_accounts_params) override; |
366 virtual void OverscrollUpdate(int delta_y) override; | 366 virtual void OverscrollUpdate(float delta_y) override; |
367 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; | 367 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; |
368 virtual void ExecuteExtensionCommand( | 368 virtual void ExecuteExtensionCommand( |
369 const extensions::Extension* extension, | 369 const extensions::Extension* extension, |
370 const extensions::Command& command) override; | 370 const extensions::Command& command) override; |
371 | 371 |
372 // Overridden from BrowserWindowTesting: | 372 // Overridden from BrowserWindowTesting: |
373 virtual BookmarkBarView* GetBookmarkBarView() const override; | 373 virtual BookmarkBarView* GetBookmarkBarView() const override; |
374 virtual LocationBarView* GetLocationBarView() const override; | 374 virtual LocationBarView* GetLocationBarView() const override; |
375 virtual views::View* GetTabContentsContainerView() const override; | 375 virtual views::View* GetTabContentsContainerView() const override; |
376 virtual ToolbarView* GetToolbarView() const override; | 376 virtual ToolbarView* GetToolbarView() const override; |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
711 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 711 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
712 | 712 |
713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 713 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
714 | 714 |
715 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 715 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
716 | 716 |
717 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 717 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
718 }; | 718 }; |
719 | 719 |
720 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 720 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |