Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_view.h |
| diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h |
| index 6778b8834d360d4585f218254c7b9b27c4773368..bc4406125def567b073f9edc7fc384d7d3719869 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.h |
| +++ b/chrome/browser/ui/views/frame/browser_view.h |
| @@ -123,6 +123,7 @@ class BrowserView : public BrowserWindow, |
| // Returns a Browser instance of this view. |
| Browser* browser() { return browser_.get(); } |
| + const Browser* browser() const { return browser_.get(); } |
| // Initializes (or re-initializes) the status bubble. We try to only create |
| // the bubble once and re-use it for the life of the browser, but certain |
| @@ -478,9 +479,9 @@ class BrowserView : public BrowserWindow, |
| FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest, |
| TestAboutChromeViewAccObj); |
| - enum FullscreenType { |
| - FOR_DESKTOP, |
| - FOR_METRO |
| + enum FullscreenMode { |
| + NORMAL_FULLSCREEN, |
|
sky
2014/03/13 22:08:25
nit: follow naming pattern we used for content (ht
|
| + METRO_SNAP_FULLSCREEN |
| }; |
| // Appends to |toolbars| a pointer to each AccessiblePaneView that |
| @@ -545,7 +546,7 @@ class BrowserView : public BrowserWindow, |
| // |bubble_type| determines what should be shown in the fullscreen exit |
| // bubble. |
| void ProcessFullscreen(bool fullscreen, |
| - FullscreenType fullscreen_type, |
| + FullscreenMode mode, |
| const GURL& url, |
| FullscreenExitBubbleType bubble_type); |