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

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller.h

Issue 789403002: Rename fullscreen_exit_bubble_* to exclusive_access_bubble_* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated based on CR comments Created 6 years 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_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" 12 #include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h"
13 #include "components/content_settings/core/common/content_settings.h" 13 #include "components/content_settings/core/common/content_settings.h"
14 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
15 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
16 16
17 class Browser; 17 class Browser;
18 class BrowserWindow; 18 class BrowserWindow;
19 class GURL; 19 class GURL;
20 class Profile; 20 class Profile;
21 21
22 namespace content { 22 namespace content {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 void LostMouseLock(); 143 void LostMouseLock();
144 144
145 // content::NotificationObserver: 145 // content::NotificationObserver:
146 void Observe(int type, 146 void Observe(int type,
147 const content::NotificationSource& source, 147 const content::NotificationSource& source,
148 const content::NotificationDetails& details) override; 148 const content::NotificationDetails& details) override;
149 149
150 // Bubble Content //////////////////////////////////////////////////////////// 150 // Bubble Content ////////////////////////////////////////////////////////////
151 151
152 GURL GetFullscreenExitBubbleURL() const; 152 GURL GetFullscreenExitBubbleURL() const;
153 FullscreenExitBubbleType GetFullscreenExitBubbleType() const; 153 ExclusiveAccessBubbleType GetExclusiveAccessBubbleType() const;
154 154
155 private: 155 private:
156 friend class FullscreenControllerTest; 156 friend class FullscreenControllerTest;
157 157
158 enum MouseLockState { 158 enum MouseLockState {
159 MOUSELOCK_NOT_REQUESTED, 159 MOUSELOCK_NOT_REQUESTED,
160 // The page requests to lock the mouse and the user hasn't responded to the 160 // The page requests to lock the mouse and the user hasn't responded to the
161 // request. 161 // request.
162 MOUSELOCK_REQUESTED, 162 MOUSELOCK_REQUESTED,
163 // Mouse lock has been allowed by the user. 163 // Mouse lock has been allowed by the user.
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // Used in testing to confirm proper behavior for specific, privileged 251 // Used in testing to confirm proper behavior for specific, privileged
252 // fullscreen cases. 252 // fullscreen cases.
253 bool is_privileged_fullscreen_for_testing_; 253 bool is_privileged_fullscreen_for_testing_;
254 254
255 base::WeakPtrFactory<FullscreenController> ptr_factory_; 255 base::WeakPtrFactory<FullscreenController> ptr_factory_;
256 256
257 DISALLOW_COPY_AND_ASSIGN(FullscreenController); 257 DISALLOW_COPY_AND_ASSIGN(FullscreenController);
258 }; 258 };
259 259
260 #endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ 260 #endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc ('k') | chrome/browser/ui/fullscreen/fullscreen_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698