| 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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 // Overridden from views::View: | 429 // Overridden from views::View: |
| 430 virtual std::string GetClassName() const OVERRIDE; | 430 virtual std::string GetClassName() const OVERRIDE; |
| 431 virtual void Layout() OVERRIDE; | 431 virtual void Layout() OVERRIDE; |
| 432 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; | 432 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; |
| 433 virtual void ViewHierarchyChanged(bool is_add, | 433 virtual void ViewHierarchyChanged(bool is_add, |
| 434 views::View* parent, | 434 views::View* parent, |
| 435 views::View* child) OVERRIDE; | 435 views::View* child) OVERRIDE; |
| 436 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; | 436 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; |
| 437 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 437 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| 438 | 438 |
| 439 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } |
| 440 views::WebView* GetContentsContainerForTest() { return contents_container_; } |
| 441 |
| 439 protected: | 442 protected: |
| 440 // Appends to |toolbars| a pointer to each AccessiblePaneView that | 443 // Appends to |toolbars| a pointer to each AccessiblePaneView that |
| 441 // can be traversed using F6, in the order they should be traversed. | 444 // can be traversed using F6, in the order they should be traversed. |
| 442 // Abstracted here so that it can be extended for Chrome OS. | 445 // Abstracted here so that it can be extended for Chrome OS. |
| 443 virtual void GetAccessiblePanes( | 446 virtual void GetAccessiblePanes( |
| 444 std::vector<views::AccessiblePaneView*>* panes); | 447 std::vector<views::AccessiblePaneView*>* panes); |
| 445 | 448 |
| 446 int last_focused_view_storage_id() const { | 449 int last_focused_view_storage_id() const { |
| 447 return last_focused_view_storage_id_; | 450 return last_focused_view_storage_id_; |
| 448 } | 451 } |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 gfx::ScopedSysColorChangeListener color_change_listener_; | 750 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 748 | 751 |
| 749 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 752 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
| 750 | 753 |
| 751 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 754 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 752 | 755 |
| 753 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 756 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 754 }; | 757 }; |
| 755 | 758 |
| 756 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 759 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |