Chromium Code Reviews| 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 | 379 |
|
Finnur
2014/09/10 10:15:16
nit: Delete line.
David Tseng
2014/09/10 21:19:07
Done.
| |
| 380 virtual bool IsExtensionCommandRegistered( | |
| 381 const ui::Accelerator& accelerator) OVERRIDE; | |
| 382 | |
| 380 // Overridden from BrowserWindowTesting: | 383 // Overridden from BrowserWindowTesting: |
| 381 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; | 384 virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE; |
| 382 virtual LocationBarView* GetLocationBarView() const OVERRIDE; | 385 virtual LocationBarView* GetLocationBarView() const OVERRIDE; |
| 383 virtual views::View* GetTabContentsContainerView() const OVERRIDE; | 386 virtual views::View* GetTabContentsContainerView() const OVERRIDE; |
| 384 virtual ToolbarView* GetToolbarView() const OVERRIDE; | 387 virtual ToolbarView* GetToolbarView() const OVERRIDE; |
| 385 | 388 |
| 386 // Overridden from TabStripModelObserver: | 389 // Overridden from TabStripModelObserver: |
| 387 virtual void TabInsertedAt(content::WebContents* contents, | 390 virtual void TabInsertedAt(content::WebContents* contents, |
| 388 int index, | 391 int index, |
| 389 bool foreground) OVERRIDE; | 392 bool foreground) OVERRIDE; |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 718 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 721 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
| 719 | 722 |
| 720 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 723 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
| 721 | 724 |
| 722 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 725 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 723 | 726 |
| 724 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 727 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 725 }; | 728 }; |
| 726 | 729 |
| 727 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 730 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |