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

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

Issue 2688413012: Don't animate the download shelf when entering/exiting fullscreen. (Closed)
Patch Set: Turn on animation for all tests except the one that was flaky due to animation. Created 3 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_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // Overrde from ExclusiveAccessControllerBase. 116 // Overrde from ExclusiveAccessControllerBase.
117 void OnTabDetachedFromView(content::WebContents* web_contents) override; 117 void OnTabDetachedFromView(content::WebContents* web_contents) override;
118 void OnTabClosing(content::WebContents* web_contents) override; 118 void OnTabClosing(content::WebContents* web_contents) override;
119 bool HandleUserPressedEscape() override; 119 bool HandleUserPressedEscape() override;
120 120
121 void ExitExclusiveAccessToPreviousState() override; 121 void ExitExclusiveAccessToPreviousState() override;
122 GURL GetURLForExclusiveAccessBubble() const override; 122 GURL GetURLForExclusiveAccessBubble() const override;
123 void ExitExclusiveAccessIfNecessary() override; 123 void ExitExclusiveAccessIfNecessary() override;
124 // Callbacks ///////////////////////////////////////////////////////////////// 124 // Callbacks /////////////////////////////////////////////////////////////////
125 125
126 // Called by Browser::WindowFullscreenStateWillChange.
127 void WindowFullscreenStateWillChange();
128
126 // Called by Browser::WindowFullscreenStateChanged. 129 // Called by Browser::WindowFullscreenStateChanged.
127 void WindowFullscreenStateChanged(); 130 void WindowFullscreenStateChanged();
128 131
129 private: 132 private:
130 friend class FullscreenControllerTest; 133 friend class FullscreenControllerTest;
131 134
132 enum FullscreenInternalOption { 135 enum FullscreenInternalOption {
133 BROWSER, 136 BROWSER,
134 TAB 137 TAB
135 }; 138 };
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 // Used in testing to confirm proper behavior for specific, privileged 196 // Used in testing to confirm proper behavior for specific, privileged
194 // fullscreen cases. 197 // fullscreen cases.
195 bool is_privileged_fullscreen_for_testing_; 198 bool is_privileged_fullscreen_for_testing_;
196 199
197 base::WeakPtrFactory<FullscreenController> ptr_factory_; 200 base::WeakPtrFactory<FullscreenController> ptr_factory_;
198 201
199 DISALLOW_COPY_AND_ASSIGN(FullscreenController); 202 DISALLOW_COPY_AND_ASSIGN(FullscreenController);
200 }; 203 };
201 204
202 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ 205 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/view_id_util_browsertest.mm ('k') | chrome/browser/ui/exclusive_access/fullscreen_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698