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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } | 453 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } |
454 ContentsContainer* GetContentsContainerForTest() { | 454 ContentsContainer* GetContentsContainerForTest() { |
455 return contents_container_; | 455 return contents_container_; |
456 } | 456 } |
457 OverlayContainer* GetOverlayContainerForTest() { | 457 OverlayContainer* GetOverlayContainerForTest() { |
458 return overlay_container_; | 458 return overlay_container_; |
459 } | 459 } |
460 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } | 460 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } |
461 | 461 |
462 private: | 462 private: |
463 friend class BrowserViewLayout; | 463 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate |
| 464 // interface to keep these two classes decoupled and testable. |
| 465 friend class BrowserViewLayoutDelegateImpl; |
464 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); | 466 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); |
465 FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, | 467 FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, |
466 TestAboutChromeViewAccObj); | 468 TestAboutChromeViewAccObj); |
467 | 469 |
468 enum FullscreenType { | 470 enum FullscreenType { |
469 FOR_DESKTOP, | 471 FOR_DESKTOP, |
470 FOR_METRO | 472 FOR_METRO |
471 }; | 473 }; |
472 | 474 |
473 // We store this on linux because we must call ProcessFullscreen() | 475 // We store this on linux because we must call ProcessFullscreen() |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
775 gfx::ScopedSysColorChangeListener color_change_listener_; | 777 gfx::ScopedSysColorChangeListener color_change_listener_; |
776 | 778 |
777 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; | 779 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; |
778 | 780 |
779 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 781 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
780 | 782 |
781 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 783 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
782 }; | 784 }; |
783 | 785 |
784 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 786 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |