| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 // Overridden from views::View: | 428 // Overridden from views::View: |
| 429 virtual std::string GetClassName() const OVERRIDE; | 429 virtual std::string GetClassName() const OVERRIDE; |
| 430 virtual void Layout() OVERRIDE; | 430 virtual void Layout() OVERRIDE; |
| 431 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; | 431 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; |
| 432 virtual void ViewHierarchyChanged(bool is_add, | 432 virtual void ViewHierarchyChanged(bool is_add, |
| 433 views::View* parent, | 433 views::View* parent, |
| 434 views::View* child) OVERRIDE; | 434 views::View* child) OVERRIDE; |
| 435 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; | 435 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; |
| 436 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 436 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| 437 | 437 |
| 438 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } |
| 439 views::WebView* GetContentsContainerForTest() { return contents_container_; } |
| 440 |
| 438 protected: | 441 protected: |
| 439 // Appends to |toolbars| a pointer to each AccessiblePaneView that | 442 // Appends to |toolbars| a pointer to each AccessiblePaneView that |
| 440 // can be traversed using F6, in the order they should be traversed. | 443 // can be traversed using F6, in the order they should be traversed. |
| 441 // Abstracted here so that it can be extended for Chrome OS. | 444 // Abstracted here so that it can be extended for Chrome OS. |
| 442 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); | 445 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); |
| 443 | 446 |
| 444 // Browser window related initializations. | 447 // Browser window related initializations. |
| 445 void Init(); | 448 void Init(); |
| 446 | 449 |
| 447 // Callback for the loading animation(s) associated with this view. | 450 // Callback for the loading animation(s) associated with this view. |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 gfx::ScopedSysColorChangeListener color_change_listener_; | 739 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 737 | 740 |
| 738 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 741 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
| 739 | 742 |
| 740 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 743 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 741 | 744 |
| 742 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 745 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 743 }; | 746 }; |
| 744 | 747 |
| 745 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 748 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |