| 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> |
| 11 | 11 |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/timer/timer.h" | 14 #include "base/timer/timer.h" |
| 15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 16 #include "chrome/browser/devtools/devtools_window.h" | 16 #include "chrome/browser/devtools/devtools_window.h" |
| 17 #include "chrome/browser/infobars/infobar_container.h" | 17 #include "chrome/browser/infobars/infobar_container.h" |
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
| 20 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" | 20 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" |
| 21 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 22 #include "chrome/browser/ui/views/frame/browser_frame.h" | 22 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 23 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 23 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
| 24 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h" | 24 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h" |
| 25 #include "chrome/browser/ui/views/frame/scroll_end_effect_controller_delegate.h" |
| 25 #include "chrome/browser/ui/views/load_complete_listener.h" | 26 #include "chrome/browser/ui/views/load_complete_listener.h" |
| 26 #include "ui/base/accelerators/accelerator.h" | 27 #include "ui/base/accelerators/accelerator.h" |
| 27 #include "ui/base/models/simple_menu_model.h" | 28 #include "ui/base/models/simple_menu_model.h" |
| 28 #include "ui/gfx/native_widget_types.h" | 29 #include "ui/gfx/native_widget_types.h" |
| 29 #include "ui/gfx/sys_color_change_listener.h" | 30 #include "ui/gfx/sys_color_change_listener.h" |
| 30 #include "ui/views/controls/button/button.h" | 31 #include "ui/views/controls/button/button.h" |
| 31 #include "ui/views/controls/single_split_view_listener.h" | 32 #include "ui/views/controls/single_split_view_listener.h" |
| 32 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" | 33 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" |
| 33 #include "ui/views/widget/widget_delegate.h" | 34 #include "ui/views/widget/widget_delegate.h" |
| 34 #include "ui/views/widget/widget_observer.h" | 35 #include "ui/views/widget/widget_observer.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 public TabStripModelObserver, | 91 public TabStripModelObserver, |
| 91 public ui::AcceleratorProvider, | 92 public ui::AcceleratorProvider, |
| 92 public views::WidgetDelegate, | 93 public views::WidgetDelegate, |
| 93 public views::WidgetObserver, | 94 public views::WidgetObserver, |
| 94 public views::ClientView, | 95 public views::ClientView, |
| 95 public ImmersiveModeController::Delegate, | 96 public ImmersiveModeController::Delegate, |
| 96 public InfoBarContainer::Delegate, | 97 public InfoBarContainer::Delegate, |
| 97 public views::SingleSplitViewListener, | 98 public views::SingleSplitViewListener, |
| 98 public gfx::SysColorChangeListener, | 99 public gfx::SysColorChangeListener, |
| 99 public LoadCompleteListener::Delegate, | 100 public LoadCompleteListener::Delegate, |
| 100 public OmniboxPopupModelObserver { | 101 public OmniboxPopupModelObserver, |
| 102 public ScrollEndEffectControllerDelegate { |
| 101 public: | 103 public: |
| 102 // The browser view's class name. | 104 // The browser view's class name. |
| 103 static const char kViewClassName[]; | 105 static const char kViewClassName[]; |
| 104 | 106 |
| 105 BrowserView(); | 107 BrowserView(); |
| 106 virtual ~BrowserView(); | 108 virtual ~BrowserView(); |
| 107 | 109 |
| 108 // Takes ownership of |browser|. | 110 // Takes ownership of |browser|. |
| 109 void Init(Browser* browser); | 111 void Init(Browser* browser); |
| 110 | 112 |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 const ViewHierarchyChangedDetails& details) OVERRIDE; | 449 const ViewHierarchyChangedDetails& details) OVERRIDE; |
| 448 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; | 450 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; |
| 449 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 451 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| 450 | 452 |
| 451 // Overridden from ui::AcceleratorTarget: | 453 // Overridden from ui::AcceleratorTarget: |
| 452 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; | 454 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
| 453 | 455 |
| 454 // OmniboxPopupModelObserver overrides | 456 // OmniboxPopupModelObserver overrides |
| 455 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE; | 457 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE; |
| 456 | 458 |
| 459 // Overriden from ScrollEndEffectControllerDelegate: |
| 460 virtual ui::Layer* GetBrowserFrameLayer() OVERRIDE; |
| 461 virtual ui::Layer* GetWebContentsLayer() OVERRIDE; |
| 462 virtual ui::Layer* GetDevToolsLayer() OVERRIDE; |
| 463 virtual views::View* GetNonClientView() OVERRIDE; |
| 464 virtual views::View* GetDownloadView() OVERRIDE; |
| 465 virtual int GetDevToolsHeight() OVERRIDE; |
| 466 virtual int GetDividerHeight() OVERRIDE; |
| 467 |
| 457 // Testing interface: | 468 // Testing interface: |
| 458 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } | 469 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } |
| 459 ContentsContainer* GetContentsContainerForTest() { | 470 ContentsContainer* GetContentsContainerForTest() { |
| 460 return contents_container_; | 471 return contents_container_; |
| 461 } | 472 } |
| 462 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } | 473 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } |
| 474 views::WebView* GetDevToolsWebViewForTest() { return devtools_container_; } |
| 463 | 475 |
| 464 private: | 476 private: |
| 465 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate | 477 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate |
| 466 // interface to keep these two classes decoupled and testable. | 478 // interface to keep these two classes decoupled and testable. |
| 467 friend class BrowserViewLayoutDelegateImpl; | 479 friend class BrowserViewLayoutDelegateImpl; |
| 468 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); | 480 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); |
| 469 FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, | 481 FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, |
| 470 TestAboutChromeViewAccObj); | 482 TestAboutChromeViewAccObj); |
| 471 | 483 |
| 472 enum FullscreenType { | 484 enum FullscreenType { |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 744 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; | 756 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; |
| 745 | 757 |
| 746 gfx::ScopedSysColorChangeListener color_change_listener_; | 758 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 747 | 759 |
| 748 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 760 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 749 | 761 |
| 750 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 762 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 751 }; | 763 }; |
| 752 | 764 |
| 753 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 765 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |