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

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

Issue 9702055: Automated tests for full screen & mouse lock M16 features (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Valgrind error fix, merge to 130358 Created 8 years, 8 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 | « no previous file | 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) 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_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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 // Figure out if there are tabs that have beforeunload handlers. 902 // Figure out if there are tabs that have beforeunload handlers.
903 bool TabsNeedBeforeUnloadFired(); 903 bool TabsNeedBeforeUnloadFired();
904 904
905 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 905 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
906 bool is_type_popup() const { return type_ == TYPE_POPUP; } 906 bool is_type_popup() const { return type_ == TYPE_POPUP; }
907 bool is_type_panel() const { return type_ == TYPE_PANEL; } 907 bool is_type_panel() const { return type_ == TYPE_PANEL; }
908 908
909 bool is_app() const; 909 bool is_app() const;
910 bool is_devtools() const; 910 bool is_devtools() const;
911 911
912 // True when the current tab is in fullscreen mode, requested by 912 // See FullscreenController::IsFullscreenForTabOrPending.
913 // webkitRequestFullScreen. 913 bool IsFullscreenForTabOrPending() const;
914 bool IsFullscreenForTab() const; 914
915 // True when the mouse cursor is locked or pending lock.
916 bool IsMouseLockedOrPending() const;
915 917
916 // Called each time the browser window is shown. 918 // Called each time the browser window is shown.
917 void OnWindowDidShow(); 919 void OnWindowDidShow();
918 920
919 // Show the first run search engine bubble on the location bar. 921 // Show the first run search engine bubble on the location bar.
920 void ShowFirstRunBubble(); 922 void ShowFirstRunBubble();
921 923
922 ExtensionWindowController* extension_window_controller() const { 924 ExtensionWindowController* extension_window_controller() const {
923 return extension_window_controller_.get(); 925 return extension_window_controller_.get();
924 } 926 }
925 927
926 protected: 928 protected:
927 // Wrapper for the factory method in BrowserWindow. This allows subclasses to 929 // Wrapper for the factory method in BrowserWindow. This allows subclasses to
928 // set their own window. 930 // set their own window.
929 virtual BrowserWindow* CreateBrowserWindow(); 931 virtual BrowserWindow* CreateBrowserWindow();
930 932
931 private: 933 private:
934 friend class BrowserTest;
932 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); 935 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
933 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); 936 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
934 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); 937 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
935 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp); 938 FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
936 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); 939 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
937 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen);
938 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen);
939 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestFullscreenBubbleMouseLockState);
940 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed); 940 FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
941 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest, 941 FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest,
942 DenyExitsFullscreen); 942 DenyExitsFullscreen);
943 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref); 943 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutNoPref);
944 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref); 944 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutWindowPref);
945 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref); 945 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutTabPref);
946 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel); 946 FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, OpenAppShortcutPanel);
947 947
948 // Used to describe why a tab is being detached. This is used by 948 // Used to describe why a tab is being detached. This is used by
949 // TabDetachedAtImpl. 949 // TabDetachedAtImpl.
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 int color_chooser_id, 1057 int color_chooser_id,
1058 const SkColor& color) OVERRIDE; 1058 const SkColor& color) OVERRIDE;
1059 virtual void DidEndColorChooser() OVERRIDE; 1059 virtual void DidEndColorChooser() OVERRIDE;
1060 virtual void RunFileChooser( 1060 virtual void RunFileChooser(
1061 content::WebContents* tab, 1061 content::WebContents* tab,
1062 const content::FileChooserParams& params) OVERRIDE; 1062 const content::FileChooserParams& params) OVERRIDE;
1063 virtual void EnumerateDirectory(content::WebContents* tab, int request_id, 1063 virtual void EnumerateDirectory(content::WebContents* tab, int request_id,
1064 const FilePath& path) OVERRIDE; 1064 const FilePath& path) OVERRIDE;
1065 virtual void ToggleFullscreenModeForTab(content::WebContents* tab, 1065 virtual void ToggleFullscreenModeForTab(content::WebContents* tab,
1066 bool enter_fullscreen) OVERRIDE; 1066 bool enter_fullscreen) OVERRIDE;
1067 virtual bool IsFullscreenForTab( 1067 virtual bool IsFullscreenForTabOrPending(
1068 const content::WebContents* tab) const OVERRIDE; 1068 const content::WebContents* tab) const OVERRIDE;
1069 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE; 1069 virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE;
1070 virtual void RegisterProtocolHandler(content::WebContents* tab, 1070 virtual void RegisterProtocolHandler(content::WebContents* tab,
1071 const std::string& protocol, 1071 const std::string& protocol,
1072 const GURL& url, 1072 const GURL& url,
1073 const string16& title) OVERRIDE; 1073 const string16& title) OVERRIDE;
1074 virtual void RegisterIntentHandler(content::WebContents* tab, 1074 virtual void RegisterIntentHandler(content::WebContents* tab,
1075 const string16& action, 1075 const string16& action,
1076 const string16& type, 1076 const string16& type,
1077 const string16& href, 1077 const string16& href,
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
1519 bool window_has_shown_; 1519 bool window_has_shown_;
1520 1520
1521 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1521 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1522 // before DidEndColorChooser is called. 1522 // before DidEndColorChooser is called.
1523 scoped_ptr<content::ColorChooser> color_chooser_; 1523 scoped_ptr<content::ColorChooser> color_chooser_;
1524 1524
1525 DISALLOW_COPY_AND_ASSIGN(Browser); 1525 DISALLOW_COPY_AND_ASSIGN(Browser);
1526 }; 1526 };
1527 1527
1528 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1528 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698