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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
434 virtual gfx::Size GetMinimumSize() OVERRIDE; | 434 virtual gfx::Size GetMinimumSize() OVERRIDE; |
435 | 435 |
436 // InfoBarContainer::Delegate overrides | 436 // InfoBarContainer::Delegate overrides |
437 virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE; | 437 virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE; |
438 virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE; | 438 virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE; |
439 virtual bool DrawInfoBarArrows(int* x) const OVERRIDE; | 439 virtual bool DrawInfoBarArrows(int* x) const OVERRIDE; |
440 | 440 |
441 // Overridden from views::View: | 441 // Overridden from views::View: |
442 virtual const char* GetClassName() const OVERRIDE; | 442 virtual const char* GetClassName() const OVERRIDE; |
443 virtual void Layout() OVERRIDE; | 443 virtual void Layout() OVERRIDE; |
444 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; | 444 virtual void PaintChildren(gfx::Canvas* canvas, |
| 445 const views::CullSet& cull_set) OVERRIDE; |
445 virtual void ViewHierarchyChanged( | 446 virtual void ViewHierarchyChanged( |
446 const ViewHierarchyChangedDetails& details) OVERRIDE; | 447 const ViewHierarchyChangedDetails& details) OVERRIDE; |
447 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; | 448 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; |
448 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; | 449 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
449 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; | 450 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; |
450 | 451 |
451 // Overridden from ui::AcceleratorTarget: | 452 // Overridden from ui::AcceleratorTarget: |
452 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; | 453 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
453 | 454 |
454 // OmniboxPopupModelObserver overrides | 455 // OmniboxPopupModelObserver overrides |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
720 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 721 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
721 | 722 |
722 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; | 723 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; |
723 | 724 |
724 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 725 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
725 | 726 |
726 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 727 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
727 }; | 728 }; |
728 | 729 |
729 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 730 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |