Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 22265009: Implement initial version of scroll end effect Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Major rewrite to handle corner cases and clean up code Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 public TabStripModelObserver, 95 public TabStripModelObserver,
95 public ui::AcceleratorProvider, 96 public ui::AcceleratorProvider,
96 public views::WidgetDelegate, 97 public views::WidgetDelegate,
97 public views::WidgetObserver, 98 public views::WidgetObserver,
98 public views::ClientView, 99 public views::ClientView,
99 public ImmersiveModeController::Delegate, 100 public ImmersiveModeController::Delegate,
100 public InfoBarContainer::Delegate, 101 public InfoBarContainer::Delegate,
101 public views::SingleSplitViewListener, 102 public views::SingleSplitViewListener,
102 public gfx::SysColorChangeListener, 103 public gfx::SysColorChangeListener,
103 public LoadCompleteListener::Delegate, 104 public LoadCompleteListener::Delegate,
104 public OmniboxPopupModelObserver { 105 public OmniboxPopupModelObserver,
106 public ScrollEndEffectControllerDelegate {
105 public: 107 public:
106 // The browser view's class name. 108 // The browser view's class name.
107 static const char kViewClassName[]; 109 static const char kViewClassName[];
108 110
109 BrowserView(); 111 BrowserView();
110 virtual ~BrowserView(); 112 virtual ~BrowserView();
111 113
112 // Takes ownership of |browser|. 114 // Takes ownership of |browser|.
113 void Init(Browser* browser); 115 void Init(Browser* browser);
114 116
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 const ViewHierarchyChangedDetails& details) OVERRIDE; 464 const ViewHierarchyChangedDetails& details) OVERRIDE;
463 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 465 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
464 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 466 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
465 467
466 // Overridden from ui::AcceleratorTarget: 468 // Overridden from ui::AcceleratorTarget:
467 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 469 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
468 470
469 // OmniboxPopupModelObserver overrides 471 // OmniboxPopupModelObserver overrides
470 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE; 472 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE;
471 473
474 // Overriden from ScrollEndEffectControllerDelegate:
475 virtual ui::Layer* GetBrowserFrameLayer() OVERRIDE;
476 virtual ui::Layer* GetWebContentsLayer() OVERRIDE;
477 virtual ui::Layer* GetDevToolsLayer() OVERRIDE;
478 virtual views::View* GetNonClientView() OVERRIDE;
479 virtual views::View* GetDownloadView() OVERRIDE;
480 virtual int GetDevToolsHeight() OVERRIDE;
481 virtual int GetDividerHeight() OVERRIDE;
482
472 // Testing interface: 483 // Testing interface:
473 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } 484 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; }
474 ContentsContainer* GetContentsContainerForTest() { 485 ContentsContainer* GetContentsContainerForTest() {
475 return contents_container_; 486 return contents_container_;
476 } 487 }
477 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } 488 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; }
489 views::WebView* GetDevToolsWebViewForTest() { return devtools_container_; }
478 490
479 private: 491 private:
480 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate 492 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
481 // interface to keep these two classes decoupled and testable. 493 // interface to keep these two classes decoupled and testable.
482 friend class BrowserViewLayoutDelegateImpl; 494 friend class BrowserViewLayoutDelegateImpl;
483 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); 495 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView);
484 FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, 496 FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest,
485 TestAboutChromeViewAccObj); 497 TestAboutChromeViewAccObj);
486 498
487 enum FullscreenType { 499 enum FullscreenType {
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 781 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
770 782
771 gfx::ScopedSysColorChangeListener color_change_listener_; 783 gfx::ScopedSysColorChangeListener color_change_listener_;
772 784
773 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 785 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
774 786
775 DISALLOW_COPY_AND_ASSIGN(BrowserView); 787 DISALLOW_COPY_AND_ASSIGN(BrowserView);
776 }; 788 };
777 789
778 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 790 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698