| 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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 Profile*, const extensions::Extension* app) OVERRIDE; | 336 Profile*, const extensions::Extension* app) OVERRIDE; |
| 337 virtual void Cut() OVERRIDE; | 337 virtual void Cut() OVERRIDE; |
| 338 virtual void Copy() OVERRIDE; | 338 virtual void Copy() OVERRIDE; |
| 339 virtual void Paste() OVERRIDE; | 339 virtual void Paste() OVERRIDE; |
| 340 virtual void ShowInstant(TabContents* preview, | 340 virtual void ShowInstant(TabContents* preview, |
| 341 int height, | 341 int height, |
| 342 InstantSizeUnits units) OVERRIDE; | 342 InstantSizeUnits units) OVERRIDE; |
| 343 virtual void HideInstant() OVERRIDE; | 343 virtual void HideInstant() OVERRIDE; |
| 344 virtual gfx::Rect GetInstantBounds() OVERRIDE; | 344 virtual gfx::Rect GetInstantBounds() OVERRIDE; |
| 345 virtual bool IsInstantTabShowing() OVERRIDE; | 345 virtual bool IsInstantTabShowing() OVERRIDE; |
| 346 virtual void SetInstantHasCustomLogo(bool has_logo) OVERRIDE; |
| 346 virtual WindowOpenDisposition GetDispositionForPopupBounds( | 347 virtual WindowOpenDisposition GetDispositionForPopupBounds( |
| 347 const gfx::Rect& bounds) OVERRIDE; | 348 const gfx::Rect& bounds) OVERRIDE; |
| 348 virtual FindBar* CreateFindBar() OVERRIDE; | 349 virtual FindBar* CreateFindBar() OVERRIDE; |
| 349 virtual bool GetConstrainedWindowTopY(int* top_y) OVERRIDE; | 350 virtual bool GetConstrainedWindowTopY(int* top_y) OVERRIDE; |
| 350 virtual void ShowAvatarBubble(content::WebContents* web_contents, | 351 virtual void ShowAvatarBubble(content::WebContents* web_contents, |
| 351 const gfx::Rect& rect) OVERRIDE; | 352 const gfx::Rect& rect) OVERRIDE; |
| 352 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; | 353 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; |
| 353 virtual void ShowPasswordGenerationBubble( | 354 virtual void ShowPasswordGenerationBubble( |
| 354 const gfx::Rect& rect, | 355 const gfx::Rect& rect, |
| 355 const content::PasswordForm& form, | 356 const content::PasswordForm& form, |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 #if defined(USE_AURA) | 732 #if defined(USE_AURA) |
| 732 scoped_ptr<SearchViewController> search_view_controller_; | 733 scoped_ptr<SearchViewController> search_view_controller_; |
| 733 #endif | 734 #endif |
| 734 | 735 |
| 735 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 736 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 736 | 737 |
| 737 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 738 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 738 }; | 739 }; |
| 739 | 740 |
| 740 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 741 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |