| 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 void HandleKeyboardEvent( | 352 void HandleKeyboardEvent( |
| 353 const content::NativeWebKeyboardEvent& event) override; | 353 const content::NativeWebKeyboardEvent& event) override; |
| 354 void Cut() override; | 354 void Cut() override; |
| 355 void Copy() override; | 355 void Copy() override; |
| 356 void Paste() override; | 356 void Paste() override; |
| 357 WindowOpenDisposition GetDispositionForPopupBounds( | 357 WindowOpenDisposition GetDispositionForPopupBounds( |
| 358 const gfx::Rect& bounds) override; | 358 const gfx::Rect& bounds) override; |
| 359 FindBar* CreateFindBar() override; | 359 FindBar* CreateFindBar() override; |
| 360 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 360 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| 361 override; | 361 override; |
| 362 void ShowAvatarBubble(content::WebContents* web_contents, | |
| 363 const gfx::Rect& rect) override; | |
| 364 void ShowAvatarBubbleFromAvatarButton( | 362 void ShowAvatarBubbleFromAvatarButton( |
| 365 AvatarBubbleMode mode, | 363 AvatarBubbleMode mode, |
| 366 const signin::ManageAccountsParams& manage_accounts_params) override; | 364 const signin::ManageAccountsParams& manage_accounts_params) override; |
| 367 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; | 365 int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; |
| 368 void ExecuteExtensionCommand(const extensions::Extension* extension, | 366 void ExecuteExtensionCommand(const extensions::Extension* extension, |
| 369 const extensions::Command& command) override; | 367 const extensions::Command& command) override; |
| 370 | 368 |
| 371 // Overridden from BrowserWindowTesting: | 369 // Overridden from BrowserWindowTesting: |
| 372 BookmarkBarView* GetBookmarkBarView() const override; | 370 BookmarkBarView* GetBookmarkBarView() const override; |
| 373 LocationBarView* GetLocationBarView() const override; | 371 LocationBarView* GetLocationBarView() const override; |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; | 703 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; |
| 706 | 704 |
| 707 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 705 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
| 708 | 706 |
| 709 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 707 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 710 | 708 |
| 711 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 709 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 712 }; | 710 }; |
| 713 | 711 |
| 714 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 712 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |