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

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

Issue 1654723002: Enable showing the toolkit-views simplified fullscreen UI on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150112-MacViews-NewFullscreenBubble
Patch Set: Fix zero-height bubble Created 4 years, 10 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
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 76
77 /////////////////////////////////////////////////////////////////////////////// 77 ///////////////////////////////////////////////////////////////////////////////
78 // BrowserView 78 // BrowserView
79 // 79 //
80 // A ClientView subclass that provides the contents of a browser window, 80 // A ClientView subclass that provides the contents of a browser window,
81 // including the TabStrip, toolbars, download shelves, the content area etc. 81 // including the TabStrip, toolbars, download shelves, the content area etc.
82 // 82 //
83 class BrowserView : public BrowserWindow, 83 class BrowserView : public BrowserWindow,
84 public TabStripModelObserver, 84 public TabStripModelObserver,
85 public ui::AcceleratorProvider,
86 public views::WidgetDelegate, 85 public views::WidgetDelegate,
87 public views::WidgetObserver, 86 public views::WidgetObserver,
88 public views::ClientView, 87 public views::ClientView,
89 public InfoBarContainerDelegate, 88 public InfoBarContainerDelegate,
90 public LoadCompleteListener::Delegate, 89 public LoadCompleteListener::Delegate,
91 public OmniboxPopupModelObserver, 90 public OmniboxPopupModelObserver,
92 public ExclusiveAccessContext, 91 public ExclusiveAccessContext,
93 public ExclusiveAccessBubbleViewsContext { 92 public ExclusiveAccessBubbleViewsContext {
94 public: 93 public:
95 // The browser view's class name. 94 // The browser view's class name.
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 void OnOmniboxPopupShownOrHidden() override; 449 void OnOmniboxPopupShownOrHidden() override;
451 450
452 // ExclusiveAccessContext overrides 451 // ExclusiveAccessContext overrides
453 Profile* GetProfile() override; 452 Profile* GetProfile() override;
454 content::WebContents* GetActiveWebContents() override; 453 content::WebContents* GetActiveWebContents() override;
455 void HideDownloadShelf() override; 454 void HideDownloadShelf() override;
456 void UnhideDownloadShelf() override; 455 void UnhideDownloadShelf() override;
457 456
458 // ExclusiveAccessBubbleViewsContext overrides 457 // ExclusiveAccessBubbleViewsContext overrides
459 ExclusiveAccessManager* GetExclusiveAccessManager() override; 458 ExclusiveAccessManager* GetExclusiveAccessManager() override;
459 views::Widget* GetBubbleAssociatedWidget() override;
460 gfx::NativeView GetParentView() const override;
461 gfx::Point GetCursorPointInParent() const override;
462 gfx::Rect GetClientAreaBoundsInScreen() const override;
460 bool IsImmersiveModeEnabled() override; 463 bool IsImmersiveModeEnabled() override;
461 views::Widget* GetBubbleAssociatedWidget() override;
462 gfx::Rect GetTopContainerBoundsInScreen() override; 464 gfx::Rect GetTopContainerBoundsInScreen() override;
463 465
464 // Testing interface: 466 // Testing interface:
465 views::View* GetContentsContainerForTest() { return contents_container_; } 467 views::View* GetContentsContainerForTest() { return contents_container_; }
466 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } 468 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; }
467 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; } 469 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; }
468 470
469 private: 471 private:
470 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate 472 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
471 // interface to keep these two classes decoupled and testable. 473 // interface to keep these two classes decoupled and testable.
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 717 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
716 718
717 SigninViewController signin_view_controller_; 719 SigninViewController signin_view_controller_;
718 720
719 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 721 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
720 722
721 DISALLOW_COPY_AND_ASSIGN(BrowserView); 723 DISALLOW_COPY_AND_ASSIGN(BrowserView);
722 }; 724 };
723 725
724 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 726 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698