| 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 <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 SkColor GetInfoBarSeparatorColor() const override; | 427 SkColor GetInfoBarSeparatorColor() const override; |
| 428 void InfoBarContainerStateChanged(bool is_animating) override; | 428 void InfoBarContainerStateChanged(bool is_animating) override; |
| 429 bool DrawInfoBarArrows(int* x) const override; | 429 bool DrawInfoBarArrows(int* x) const override; |
| 430 | 430 |
| 431 // Overridden from views::View: | 431 // Overridden from views::View: |
| 432 const char* GetClassName() const override; | 432 const char* GetClassName() const override; |
| 433 void Layout() override; | 433 void Layout() override; |
| 434 void OnGestureEvent(ui::GestureEvent* event) override; | 434 void OnGestureEvent(ui::GestureEvent* event) override; |
| 435 void ViewHierarchyChanged( | 435 void ViewHierarchyChanged( |
| 436 const ViewHierarchyChangedDetails& details) override; | 436 const ViewHierarchyChangedDetails& details) override; |
| 437 void PaintChildren(const ui::PaintContext& context) override; | 437 void PaintChildren(const views::PaintInfo& paint_info) override; |
| 438 void ChildPreferredSizeChanged(View* child) override; | 438 void ChildPreferredSizeChanged(View* child) override; |
| 439 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; | 439 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; |
| 440 void OnThemeChanged() override; | 440 void OnThemeChanged() override; |
| 441 | 441 |
| 442 // Overridden from ui::AcceleratorTarget: | 442 // Overridden from ui::AcceleratorTarget: |
| 443 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; | 443 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
| 444 | 444 |
| 445 // OmniboxPopupModelObserver overrides | 445 // OmniboxPopupModelObserver overrides |
| 446 void OnOmniboxPopupShownOrHidden() override; | 446 void OnOmniboxPopupShownOrHidden() override; |
| 447 | 447 |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 | 718 |
| 719 std::unique_ptr<FullscreenControlHost> fullscreen_control_host_; | 719 std::unique_ptr<FullscreenControlHost> fullscreen_control_host_; |
| 720 | 720 |
| 721 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_{ | 721 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_{ |
| 722 this}; | 722 this}; |
| 723 | 723 |
| 724 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 724 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 725 }; | 725 }; |
| 726 | 726 |
| 727 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 727 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |