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

Side by Side Diff: chrome/browser/ui/exclusive_access/exclusive_access_manager.h

Issue 1252503007: Added flag simplified-fullscreen-ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added link to discussion bug 515747. Created 5 years, 4 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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ 5 #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
6 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ 6 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" 9 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h"
10 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 10 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
(...skipping 25 matching lines...) Expand all
36 return &mouse_lock_controller_; 36 return &mouse_lock_controller_;
37 } 37 }
38 38
39 ExclusiveAccessContext* context() const { return exclusive_access_context_; } 39 ExclusiveAccessContext* context() const { return exclusive_access_context_; }
40 40
41 ExclusiveAccessBubbleType GetExclusiveAccessExitBubbleType() const; 41 ExclusiveAccessBubbleType GetExclusiveAccessExitBubbleType() const;
42 void UpdateExclusiveAccessExitBubbleContent(); 42 void UpdateExclusiveAccessExitBubbleContent();
43 43
44 GURL GetExclusiveAccessBubbleURL() const; 44 GURL GetExclusiveAccessBubbleURL() const;
45 45
46 static bool IsSimplifiedFullscreenUIEnabled();
47
46 // Callbacks //////////////////////////////////////////////////////////////// 48 // Callbacks ////////////////////////////////////////////////////////////////
47 49
48 // Called by Browser::TabDeactivated. 50 // Called by Browser::TabDeactivated.
49 void OnTabDeactivated(content::WebContents* web_contents); 51 void OnTabDeactivated(content::WebContents* web_contents);
50 52
51 // Called by Browser::ActiveTabChanged. 53 // Called by Browser::ActiveTabChanged.
52 void OnTabDetachedFromView(content::WebContents* web_contents); 54 void OnTabDetachedFromView(content::WebContents* web_contents);
53 55
54 // Called by Browser::TabClosingAt. 56 // Called by Browser::TabClosingAt.
55 void OnTabClosing(content::WebContents* web_contents); 57 void OnTabClosing(content::WebContents* web_contents);
56 58
57 // Called by Browser::PreHandleKeyboardEvent 59 // Called by Browser::PreHandleKeyboardEvent
58 bool HandleUserPressedEscape(); 60 bool HandleUserPressedEscape();
59 61
60 // Called by platform ExclusiveAccessExitBubble. 62 // Called by platform ExclusiveAccessExitBubble.
61 void OnAcceptExclusiveAccessPermission(); 63 void OnAcceptExclusiveAccessPermission();
62 void OnDenyExclusiveAccessPermission(); 64 void OnDenyExclusiveAccessPermission();
63 void ExitExclusiveAccess(); 65 void ExitExclusiveAccess();
64 66
65 private: 67 private:
66 ExclusiveAccessContext* const exclusive_access_context_; 68 ExclusiveAccessContext* const exclusive_access_context_;
67 FullscreenController fullscreen_controller_; 69 FullscreenController fullscreen_controller_;
68 MouseLockController mouse_lock_controller_; 70 MouseLockController mouse_lock_controller_;
69 71
70 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager); 72 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager);
71 }; 73 };
72 74
73 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ 75 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/exclusive_access/exclusive_access_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698