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

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

Issue 8351086: Merge 107841 - Fix a crash in FullscreenExitBubbleController when the user clicks the "Exit full ... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/912/src/
Patch Set: Created 9 years, 1 month 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 | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.h » ('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 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 private: 844 private:
845 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); 845 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
846 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 846 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
847 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); 847 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
848 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); 848 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
849 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); 849 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
850 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen); 850 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen);
851 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen); 851 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen);
852 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestFullscreenBubbleMouseLockState); 852 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestFullscreenBubbleMouseLockState);
853 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed); 853 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
854 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest,
855 DenyExitsFullscreen);
854 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref); 856 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref);
855 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref); 857 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref);
856 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref); 858 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
857 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel); 859 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel);
858 860
859 // Used to describe why a tab is being detached. This is used by 861 // Used to describe why a tab is being detached. This is used by
860 // TabDetachedAtImpl. 862 // TabDetachedAtImpl.
861 enum DetachType { 863 enum DetachType {
862 // Result of TabDetachedAt. 864 // Result of TabDetachedAt.
863 DETACH_TYPE_DETACH, 865 DETACH_TYPE_DETACH,
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 1434
1433 MouseLockState mouse_lock_state_; 1435 MouseLockState mouse_lock_state_;
1434 1436
1435 // True if the browser window has been shown at least once. 1437 // True if the browser window has been shown at least once.
1436 bool window_has_shown_; 1438 bool window_has_shown_;
1437 1439
1438 DISALLOW_COPY_AND_ASSIGN(Browser); 1440 DISALLOW_COPY_AND_ASSIGN(Browser);
1439 }; 1441 };
1440 1442
1441 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1443 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698