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

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: Responded to outstanding comments from sadrul@ Created 7 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 public BrowserWindowTesting, 90 public BrowserWindowTesting,
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 InfoBarContainer::Delegate, 96 public InfoBarContainer::Delegate,
96 public views::SingleSplitViewListener, 97 public views::SingleSplitViewListener,
97 public gfx::SysColorChangeListener, 98 public gfx::SysColorChangeListener,
98 public LoadCompleteListener::Delegate, 99 public LoadCompleteListener::Delegate,
99 public OmniboxPopupModelObserver { 100 public OmniboxPopupModelObserver,
101 public ScrollEndEffectControllerDelegate {
100 public: 102 public:
101 // The browser view's class name. 103 // The browser view's class name.
102 static const char kViewClassName[]; 104 static const char kViewClassName[];
103 105
104 BrowserView(); 106 BrowserView();
105 virtual ~BrowserView(); 107 virtual ~BrowserView();
106 108
107 // Takes ownership of |browser|. 109 // Takes ownership of |browser|.
108 void Init(Browser* browser); 110 void Init(Browser* browser);
109 111
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 const ViewHierarchyChangedDetails& details) OVERRIDE; 452 const ViewHierarchyChangedDetails& details) OVERRIDE;
451 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 453 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
452 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 454 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
453 455
454 // Overridden from ui::AcceleratorTarget: 456 // Overridden from ui::AcceleratorTarget:
455 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 457 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
456 458
457 // OmniboxPopupModelObserver overrides 459 // OmniboxPopupModelObserver overrides
458 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE; 460 virtual void OnOmniboxPopupShownOrHidden() OVERRIDE;
459 461
462 // Overriden from ScrollEndEffectControllerDelegate:
463 virtual ContentsContainer* GetContentsContainer() OVERRIDE;
464 virtual gfx::Rect GetFrameBounds() OVERRIDE;
465 virtual void SetFrameBounds(gfx::Rect bounds) OVERRIDE;
466
460 // Testing interface: 467 // Testing interface:
461 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; } 468 views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; }
462 ContentsContainer* GetContentsContainerForTest() { 469 ContentsContainer* GetContentsContainerForTest() {
463 return contents_container_; 470 return contents_container_;
464 } 471 }
465 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } 472 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; }
466 473
467 private: 474 private:
468 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate 475 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
469 // interface to keep these two classes decoupled and testable. 476 // interface to keep these two classes decoupled and testable.
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 750 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
744 751
745 gfx::ScopedSysColorChangeListener color_change_listener_; 752 gfx::ScopedSysColorChangeListener color_change_listener_;
746 753
747 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 754 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
748 755
749 DISALLOW_COPY_AND_ASSIGN(BrowserView); 756 DISALLOW_COPY_AND_ASSIGN(BrowserView);
750 }; 757 };
751 758
752 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 759 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698