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

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

Issue 48963002: [Refactor] Move the non-browser specific logic of ImmersiveModeControllerAsh into ash part 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « ash/wm/immersive_revealed_lock.cc ('k') | 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>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // A ClientView subclass that provides the contents of a browser window, 85 // A ClientView subclass that provides the contents of a browser window,
86 // including the TabStrip, toolbars, download shelves, the content area etc. 86 // including the TabStrip, toolbars, download shelves, the content area etc.
87 // 87 //
88 class BrowserView : public BrowserWindow, 88 class BrowserView : public BrowserWindow,
89 public BrowserWindowTesting, 89 public BrowserWindowTesting,
90 public TabStripModelObserver, 90 public TabStripModelObserver,
91 public ui::AcceleratorProvider, 91 public ui::AcceleratorProvider,
92 public views::WidgetDelegate, 92 public views::WidgetDelegate,
93 public views::WidgetObserver, 93 public views::WidgetObserver,
94 public views::ClientView, 94 public views::ClientView,
95 public ImmersiveModeController::Delegate,
96 public InfoBarContainer::Delegate, 95 public InfoBarContainer::Delegate,
97 public views::SingleSplitViewListener, 96 public views::SingleSplitViewListener,
98 public gfx::SysColorChangeListener, 97 public gfx::SysColorChangeListener,
99 public LoadCompleteListener::Delegate, 98 public LoadCompleteListener::Delegate,
100 public OmniboxPopupModelObserver { 99 public OmniboxPopupModelObserver {
101 public: 100 public:
102 // The browser view's class name. 101 // The browser view's class name.
103 static const char kViewClassName[]; 102 static const char kViewClassName[];
104 103
105 BrowserView(); 104 BrowserView();
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // Restores the focused view. This is also used to set the initial focus 244 // Restores the focused view. This is also used to set the initial focus
246 // when a new browser window is created. 245 // when a new browser window is created.
247 void RestoreFocus(); 246 void RestoreFocus();
248 247
249 void SetWindowSwitcherButton(views::Button* button); 248 void SetWindowSwitcherButton(views::Button* button);
250 249
251 views::Button* window_switcher_button() { 250 views::Button* window_switcher_button() {
252 return window_switcher_button_; 251 return window_switcher_button_;
253 } 252 }
254 253
254 // Called after the widget's fullscreen state is changed without going through
255 // FullscreenController. This method does any processing which was skipped.
256 // Only exiting fullscreen in this way is currently supported.
257 void FullscreenStateChanged();
258
255 // Called from BookmarkBarView/DownloadShelfView during their show/hide 259 // Called from BookmarkBarView/DownloadShelfView during their show/hide
256 // animations. 260 // animations.
257 void ToolbarSizeChanged(bool is_animating); 261 void ToolbarSizeChanged(bool is_animating);
258 262
259 // Overridden from BrowserWindow: 263 // Overridden from BrowserWindow:
260 virtual void Show() OVERRIDE; 264 virtual void Show() OVERRIDE;
261 virtual void ShowInactive() OVERRIDE; 265 virtual void ShowInactive() OVERRIDE;
262 virtual void Hide() OVERRIDE; 266 virtual void Hide() OVERRIDE;
263 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 267 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
264 virtual void Close() OVERRIDE; 268 virtual void Close() OVERRIDE;
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 424
421 // Overridden from views::WidgetObserver: 425 // Overridden from views::WidgetObserver:
422 virtual void OnWidgetActivationChanged(views::Widget* widget, 426 virtual void OnWidgetActivationChanged(views::Widget* widget,
423 bool active) OVERRIDE; 427 bool active) OVERRIDE;
424 428
425 // Overridden from views::ClientView: 429 // Overridden from views::ClientView:
426 virtual bool CanClose() OVERRIDE; 430 virtual bool CanClose() OVERRIDE;
427 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 431 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
428 virtual gfx::Size GetMinimumSize() OVERRIDE; 432 virtual gfx::Size GetMinimumSize() OVERRIDE;
429 433
430 // ImmersiveModeController::Delegate overrides:
431 virtual FullscreenController* GetFullscreenController() OVERRIDE;
432 virtual void FullscreenStateChanged() OVERRIDE;
433 virtual void SetImmersiveStyle(bool immersive) OVERRIDE;
434 virtual content::WebContents* GetWebContents() OVERRIDE;
435
436 // InfoBarContainer::Delegate overrides 434 // InfoBarContainer::Delegate overrides
437 virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE; 435 virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE;
438 virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE; 436 virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
439 virtual bool DrawInfoBarArrows(int* x) const OVERRIDE; 437 virtual bool DrawInfoBarArrows(int* x) const OVERRIDE;
440 438
441 // views::SingleSplitViewListener overrides: 439 // views::SingleSplitViewListener overrides:
442 virtual bool SplitHandleMoved(views::SingleSplitView* sender) OVERRIDE; 440 virtual bool SplitHandleMoved(views::SingleSplitView* sender) OVERRIDE;
443 441
444 // gfx::SysColorChangeListener overrides: 442 // gfx::SysColorChangeListener overrides:
445 virtual void OnSysColorChange() OVERRIDE; 443 virtual void OnSysColorChange() OVERRIDE;
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_; 748 scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
751 749
752 gfx::ScopedSysColorChangeListener color_change_listener_; 750 gfx::ScopedSysColorChangeListener color_change_listener_;
753 751
754 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 752 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
755 753
756 DISALLOW_COPY_AND_ASSIGN(BrowserView); 754 DISALLOW_COPY_AND_ASSIGN(BrowserView);
757 }; 755 };
758 756
759 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 757 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « ash/wm/immersive_revealed_lock.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698