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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 30 matching lines...) Expand all
41 #endif 41 #endif
42 42
43 // NOTE: For more information about the objects and files in this directory, 43 // NOTE: For more information about the objects and files in this directory,
44 // view: http://dev.chromium.org/developers/design-documents/browser-window 44 // view: http://dev.chromium.org/developers/design-documents/browser-window
45 45
46 class BookmarkBarView; 46 class BookmarkBarView;
47 class Browser; 47 class Browser;
48 class BrowserViewLayout; 48 class BrowserViewLayout;
49 class ContentsLayoutManager; 49 class ContentsLayoutManager;
50 class DownloadShelfView; 50 class DownloadShelfView;
51 class FullscreenExitBubbleViews; 51 class ExclusiveAccessBubbleViews;
52 class InfoBarContainerView; 52 class InfoBarContainerView;
53 class LocationBarView; 53 class LocationBarView;
54 class PermissionBubbleViewViews; 54 class PermissionBubbleViewViews;
55 class StatusBubbleViews; 55 class StatusBubbleViews;
56 class SearchViewController; 56 class SearchViewController;
57 class TabStrip; 57 class TabStrip;
58 class TabStripModel; 58 class TabStripModel;
59 class ToolbarView; 59 class ToolbarView;
60 class TopContainerView; 60 class TopContainerView;
61 class WebContentsCloseHandler; 61 class WebContentsCloseHandler;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // widget relative to views which paint into layers and views which have an 172 // widget relative to views which paint into layers and views which have an
173 // associated NativeView. The presence / visibility of this view is not 173 // associated NativeView. The presence / visibility of this view is not
174 // indicative of the visibility of the find bar widget or even whether 174 // indicative of the visibility of the find bar widget or even whether
175 // FindBarController is initialized. 175 // FindBarController is initialized.
176 View* find_bar_host_view() { return find_bar_host_view_; } 176 View* find_bar_host_view() { return find_bar_host_view_; }
177 177
178 // Accessor for the InfobarContainer. 178 // Accessor for the InfobarContainer.
179 InfoBarContainerView* infobar_container() { return infobar_container_; } 179 InfoBarContainerView* infobar_container() { return infobar_container_; }
180 180
181 // Accessor for the FullscreenExitBubbleViews. 181 // Accessor for the FullscreenExitBubbleViews.
182 FullscreenExitBubbleViews* fullscreen_exit_bubble() { 182 ExclusiveAccessBubbleViews* exclusive_access_bubble() {
183 return fullscreen_bubble_.get(); 183 return exclusive_access_bubble_.get();
184 } 184 }
185 185
186 // Returns true if various window components are visible. 186 // Returns true if various window components are visible.
187 bool IsTabStripVisible() const; 187 bool IsTabStripVisible() const;
188 188
189 // Returns true if the profile associated with this Browser window is 189 // Returns true if the profile associated with this Browser window is
190 // incognito. 190 // incognito.
191 bool IsOffTheRecord() const; 191 bool IsOffTheRecord() const;
192 192
193 // Returns true if the profile associated with this Browser window is 193 // Returns true if the profile associated with this Browser window is
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 void ZoomChangedForActiveTab(bool can_show_bubble) override; 274 void ZoomChangedForActiveTab(bool can_show_bubble) override;
275 gfx::Rect GetRestoredBounds() const override; 275 gfx::Rect GetRestoredBounds() const override;
276 ui::WindowShowState GetRestoredState() const override; 276 ui::WindowShowState GetRestoredState() const override;
277 gfx::Rect GetBounds() const override; 277 gfx::Rect GetBounds() const override;
278 bool IsMaximized() const override; 278 bool IsMaximized() const override;
279 bool IsMinimized() const override; 279 bool IsMinimized() const override;
280 void Maximize() override; 280 void Maximize() override;
281 void Minimize() override; 281 void Minimize() override;
282 void Restore() override; 282 void Restore() override;
283 void EnterFullscreen(const GURL& url, 283 void EnterFullscreen(const GURL& url,
284 FullscreenExitBubbleType bubble_type, 284 ExclusiveAccessBubbleType bubble_type,
285 bool with_toolbar) override; 285 bool with_toolbar) override;
286 void ExitFullscreen() override; 286 void ExitFullscreen() override;
287 void UpdateFullscreenExitBubbleContent( 287 void UpdateFullscreenExitBubbleContent(
288 const GURL& url, 288 const GURL& url,
289 FullscreenExitBubbleType bubble_type) override; 289 ExclusiveAccessBubbleType bubble_type) override;
290 bool ShouldHideUIForFullscreen() const override; 290 bool ShouldHideUIForFullscreen() const override;
291 bool IsFullscreen() const override; 291 bool IsFullscreen() const override;
292 bool IsFullscreenBubbleVisible() const override; 292 bool IsFullscreenBubbleVisible() const override;
293 bool SupportsFullscreenWithToolbar() const override; 293 bool SupportsFullscreenWithToolbar() const override;
294 void UpdateFullscreenWithToolbar(bool with_toolbar) override; 294 void UpdateFullscreenWithToolbar(bool with_toolbar) override;
295 bool IsFullscreenWithToolbar() const override; 295 bool IsFullscreenWithToolbar() const override;
296 #if defined(OS_WIN) 296 #if defined(OS_WIN)
297 virtual void SetMetroSnapMode(bool enable) override; 297 virtual void SetMetroSnapMode(bool enable) override;
298 virtual bool IsInMetroSnapMode() const override; 298 virtual bool IsInMetroSnapMode() const override;
299 #endif 299 #endif
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 // full screen state. On Linux changing the fullscreen state is async, so we 520 // full screen state. On Linux changing the fullscreen state is async, so we
521 // ask the window to change its fullscreen state, then when we get 521 // ask the window to change its fullscreen state, then when we get
522 // notification that it succeeded this method is invoked. 522 // notification that it succeeded this method is invoked.
523 // If |url| is not empty, it is the URL of the page that requested fullscreen 523 // If |url| is not empty, it is the URL of the page that requested fullscreen
524 // (via the fullscreen JS API). 524 // (via the fullscreen JS API).
525 // |bubble_type| determines what should be shown in the fullscreen exit 525 // |bubble_type| determines what should be shown in the fullscreen exit
526 // bubble. 526 // bubble.
527 void ProcessFullscreen(bool fullscreen, 527 void ProcessFullscreen(bool fullscreen,
528 FullscreenMode mode, 528 FullscreenMode mode,
529 const GURL& url, 529 const GURL& url,
530 FullscreenExitBubbleType bubble_type); 530 ExclusiveAccessBubbleType bubble_type);
531 531
532 // Returns whether immmersive fullscreen should replace fullscreen. This 532 // Returns whether immmersive fullscreen should replace fullscreen. This
533 // should only occur for "browser-fullscreen" for tabbed-typed windows (not 533 // should only occur for "browser-fullscreen" for tabbed-typed windows (not
534 // for tab-fullscreen and not for app/popup type windows). 534 // for tab-fullscreen and not for app/popup type windows).
535 bool ShouldUseImmersiveFullscreenForUrl(const GURL& url) const; 535 bool ShouldUseImmersiveFullscreenForUrl(const GURL& url) const;
536 536
537 // Copy the accelerator table from the app resources into something we can 537 // Copy the accelerator table from the app resources into something we can
538 // use. 538 // use.
539 void LoadAccelerators(); 539 void LoadAccelerators();
540 540
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 std::map<ui::Accelerator, int> accelerator_table_; 660 std::map<ui::Accelerator, int> accelerator_table_;
661 661
662 // True if we have already been initialized. 662 // True if we have already been initialized.
663 bool initialized_; 663 bool initialized_;
664 664
665 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and 665 // True when in ProcessFullscreen(). The flag is used to avoid reentrance and
666 // to ignore requests to layout while in ProcessFullscreen() to reduce 666 // to ignore requests to layout while in ProcessFullscreen() to reduce
667 // jankiness. 667 // jankiness.
668 bool in_process_fullscreen_; 668 bool in_process_fullscreen_;
669 669
670 scoped_ptr<FullscreenExitBubbleViews> fullscreen_bubble_; 670 scoped_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_;
671 671
672 #if defined(OS_WIN) 672 #if defined(OS_WIN)
673 // This object is used to perform periodic actions in a worker 673 // This object is used to perform periodic actions in a worker
674 // thread. It is currently used to monitor hung plugin windows. 674 // thread. It is currently used to monitor hung plugin windows.
675 WorkerThreadTicker ticker_; 675 WorkerThreadTicker ticker_;
676 676
677 // This object is initialized with the frame window HWND. This 677 // This object is initialized with the frame window HWND. This
678 // object is also passed as a tick handler with the ticker_ object. 678 // object is also passed as a tick handler with the ticker_ object.
679 // It is used to periodically monitor for hung plugin windows 679 // It is used to periodically monitor for hung plugin windows
680 HungWindowDetector hung_window_detector_; 680 HungWindowDetector hung_window_detector_;
(...skipping 24 matching lines...) Expand all
705 scoped_ptr<ImmersiveModeController> immersive_mode_controller_; 705 scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
706 706
707 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; 707 scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
708 708
709 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 709 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
710 710
711 DISALLOW_COPY_AND_ASSIGN(BrowserView); 711 DISALLOW_COPY_AND_ASSIGN(BrowserView);
712 }; 712 };
713 713
714 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 714 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/exclusive_access_bubble_views.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698