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

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

Issue 7890056: FullscreenExitBubble temp UI for Mac. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix url? Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/nibs/FullscreenExitBubble.xib ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 // Figure out if there are tabs that have beforeunload handlers. 832 // Figure out if there are tabs that have beforeunload handlers.
833 bool TabsNeedBeforeUnloadFired(); 833 bool TabsNeedBeforeUnloadFired();
834 834
835 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 835 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
836 bool is_type_popup() const { return type_ == TYPE_POPUP; } 836 bool is_type_popup() const { return type_ == TYPE_POPUP; }
837 bool is_type_panel() const { return type_ == TYPE_PANEL; } 837 bool is_type_panel() const { return type_ == TYPE_PANEL; }
838 838
839 bool is_app() const; 839 bool is_app() const;
840 bool is_devtools() const; 840 bool is_devtools() const;
841 841
842 // True when the current tab is in fullscreen mode, requested by
843 // webkitRequestFullScreen.
844 bool is_fullscreen_for_tab() const { return fullscreened_tab_ != NULL; }
845
842 protected: 846 protected:
843 // Wrapper for the factory method in BrowserWindow. This allows subclasses to 847 // Wrapper for the factory method in BrowserWindow. This allows subclasses to
844 // set their own window. 848 // set their own window.
845 virtual BrowserWindow* CreateBrowserWindow(); 849 virtual BrowserWindow* CreateBrowserWindow();
846 850
847 private: 851 private:
848 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); 852 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
849 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 853 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
850 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); 854 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
851 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); 855 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
852 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); 856 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
853 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen); 857 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen);
854 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen); 858 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen);
859 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
855 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref); 860 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref);
856 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref); 861 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref);
857 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref); 862 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
858 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel); 863 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel);
859 864
860 // Used to describe why a tab is being detached. This is used by 865 // Used to describe why a tab is being detached. This is used by
861 // TabDetachedAtImpl. 866 // TabDetachedAtImpl.
862 enum DetachType { 867 enum DetachType {
863 // Result of TabDetachedAt. 868 // Result of TabDetachedAt.
864 DETACH_TYPE_DETACH, 869 DETACH_TYPE_DETACH,
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1414 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; 1419 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
1415 1420
1416 // Helper which implements the SyncedWindowDelegate interface. 1421 // Helper which implements the SyncedWindowDelegate interface.
1417 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_; 1422 scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
1418 1423
1419 scoped_ptr<InstantController> instant_; 1424 scoped_ptr<InstantController> instant_;
1420 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1425 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1421 1426
1422 BookmarkBar::State bookmark_bar_state_; 1427 BookmarkBar::State bookmark_bar_state_;
1423 1428
1424 // Tab to notify when the browser exits fullscreen mode. 1429 // If there is currently a tab in fullscreen mode (entered via
1430 // webkitRequestFullScreen), this is its wrapper.
1425 TabContentsWrapper* fullscreened_tab_; 1431 TabContentsWrapper* fullscreened_tab_;
1426 1432
1427 // True if the current tab is in fullscreen mode. 1433 // True if the current tab entered fullscreen mode via webkitRequestFullScreen
1428 bool tab_caused_fullscreen_; 1434 bool tab_caused_fullscreen_;
1429 1435
1430 DISALLOW_COPY_AND_ASSIGN(Browser); 1436 DISALLOW_COPY_AND_ASSIGN(Browser);
1431 }; 1437 };
1432 1438
1433 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1439 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/app/nibs/FullscreenExitBubble.xib ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698