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

Side by Side Diff: chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h

Issue 1737413002: Modified the behavior of "Hide Toolbar in Full Screen" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feb -> March Created 4 years, 9 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_
7 7
8 // Note this file has a _views suffix so that it may have an optional runtime 8 // Note this file has a _views suffix so that it may have an optional runtime
9 // dependency on toolkit-views UI. 9 // dependency on toolkit-views UI.
10 10
11 #import <CoreGraphics/CoreGraphics.h> 11 #import <CoreGraphics/CoreGraphics.h>
12 12
13 #import "base/mac/scoped_nsobject.h" 13 #import "base/mac/scoped_nsobject.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 16 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
17 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" 17 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h"
18 #include "components/prefs/pref_change_registrar.h"
18 #include "ui/base/accelerators/accelerator.h" 19 #include "ui/base/accelerators/accelerator.h"
19 20
20 class Browser; 21 class Browser;
21 class BrowserWindow; 22 class BrowserWindow;
22 @class BrowserWindowController; 23 @class BrowserWindowController;
23 class ExclusiveAccessBubbleViews; 24 class ExclusiveAccessBubbleViews;
24 @class ExclusiveAccessBubbleWindowController; 25 @class ExclusiveAccessBubbleWindowController;
25 class GURL; 26 class GURL;
26 27
27 // Component placed into a browser window controller to manage communication 28 // Component placed into a browser window controller to manage communication
(...skipping 20 matching lines...) Expand all
48 void Destroy(); 49 void Destroy();
49 50
50 // If showing, position the bubble at the given y-coordinate. 51 // If showing, position the bubble at the given y-coordinate.
51 void Layout(CGFloat max_y); 52 void Layout(CGFloat max_y);
52 53
53 // ExclusiveAccessContext: 54 // ExclusiveAccessContext:
54 Profile* GetProfile() override; 55 Profile* GetProfile() override;
55 bool IsFullscreen() const override; 56 bool IsFullscreen() const override;
56 bool SupportsFullscreenWithToolbar() const override; 57 bool SupportsFullscreenWithToolbar() const override;
57 void UpdateFullscreenWithToolbar(bool with_toolbar) override; 58 void UpdateFullscreenWithToolbar(bool with_toolbar) override;
58 void ToggleFullscreenToolbar() override; 59 void UpdateFullscreenToolbar() override;
59 bool IsFullscreenWithToolbar() const override; 60 bool IsFullscreenWithToolbar() const override;
60 void EnterFullscreen(const GURL& url, 61 void EnterFullscreen(const GURL& url,
61 ExclusiveAccessBubbleType type, 62 ExclusiveAccessBubbleType type,
62 bool with_toolbar) override; 63 bool with_toolbar) override;
63 void ExitFullscreen() override; 64 void ExitFullscreen() override;
64 void UpdateExclusiveAccessExitBubbleContent( 65 void UpdateExclusiveAccessExitBubbleContent(
65 const GURL& url, 66 const GURL& url,
66 ExclusiveAccessBubbleType bubble_type) override; 67 ExclusiveAccessBubbleType bubble_type) override;
67 void OnExclusiveAccessUserInput() override; 68 void OnExclusiveAccessUserInput() override;
68 content::WebContents* GetActiveWebContents() override; 69 content::WebContents* GetActiveWebContents() override;
(...skipping 22 matching lines...) Expand all
91 92
92 // When going fullscreen for a tab, we need to store the URL and the 93 // When going fullscreen for a tab, we need to store the URL and the
93 // fullscreen type, since we can't show the bubble until 94 // fullscreen type, since we can't show the bubble until
94 // -windowDidEnterFullScreen: gets called. 95 // -windowDidEnterFullScreen: gets called.
95 GURL url_; 96 GURL url_;
96 ExclusiveAccessBubbleType bubble_type_; 97 ExclusiveAccessBubbleType bubble_type_;
97 98
98 scoped_ptr<ExclusiveAccessBubbleViews> views_bubble_; 99 scoped_ptr<ExclusiveAccessBubbleViews> views_bubble_;
99 base::scoped_nsobject<ExclusiveAccessBubbleWindowController> cocoa_bubble_; 100 base::scoped_nsobject<ExclusiveAccessBubbleWindowController> cocoa_bubble_;
100 101
102 // Used to keep track of the kShowFullscreenToolbar preference.
103 PrefChangeRegistrar pref_registrar_;
104
101 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessController); 105 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessController);
102 }; 106 };
103 107
104 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_ 108 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_EXCLUSIVE_ACCESS_CONTROLLER_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_ui_prefs.cc ('k') | chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698