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 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE; | 369 const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE; |
370 virtual void ShowPasswordGenerationBubble( | 370 virtual void ShowPasswordGenerationBubble( |
371 const gfx::Rect& rect, | 371 const gfx::Rect& rect, |
372 const autofill::PasswordForm& form, | 372 const autofill::PasswordForm& form, |
373 autofill::PasswordGenerator* password_generator) OVERRIDE; | 373 autofill::PasswordGenerator* password_generator) OVERRIDE; |
374 virtual void OverscrollUpdate(int delta_y) OVERRIDE; | 374 virtual void OverscrollUpdate(int delta_y) OVERRIDE; |
375 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; | 375 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; |
376 virtual void ExecuteExtensionCommand( | 376 virtual void ExecuteExtensionCommand( |
377 const extensions::Extension* extension, | 377 const extensions::Extension* extension, |
378 const extensions::Command& command) OVERRIDE; | 378 const extensions::Command& command) OVERRIDE; |
379 virtual void ShowPageActionPopup( | |
380 const extensions::Extension* extension) OVERRIDE; | |
381 virtual void ShowBrowserActionPopup( | |
382 const extensions::Extension* extension) OVERRIDE; | |
383 | 379 |
384 // Overridden from BrowserWindowTesting: | 380 // Overridden from BrowserWindowTesting: |
385 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 381 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
386 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 382 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
387 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 383 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
388 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 384 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
389 | 385 |
390 // Overridden from TabStripModelObserver: | 386 // Overridden from TabStripModelObserver: |
391 virtual void TabInsertedAt(content::WebContents* contents, | 387 virtual void TabInsertedAt(content::WebContents* contents, |
392 int index, | 388 int index, |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
722 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 718 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
723 | 719 |
724 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 720 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
725 | 721 |
726 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 722 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
727 | 723 |
728 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 724 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
729 }; | 725 }; |
730 | 726 |
731 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 727 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |