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

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

Issue 8734016: Make platform apps use and require a different container ("shell" instead of "panel") (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix socket test Created 9 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 | Annotate | Revision Log
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 public SelectFileDialog::Listener, 86 public SelectFileDialog::Listener,
87 public TabRestoreServiceObserver, 87 public TabRestoreServiceObserver,
88 public ProfileSyncServiceObserver, 88 public ProfileSyncServiceObserver,
89 public InstantDelegate { 89 public InstantDelegate {
90 public: 90 public:
91 // SessionService::WindowType mirrors these values. If you add to this 91 // SessionService::WindowType mirrors these values. If you add to this
92 // enum, look at SessionService::WindowType to see if it needs to be 92 // enum, look at SessionService::WindowType to see if it needs to be
93 // updated. 93 // updated.
94 enum Type { 94 enum Type {
95 // If you add a new type, consider updating the test 95 // If you add a new type, consider updating the test
96 // BrowserTest.StartMaximized. 96 // BrowserTest.StartMaximized.
miket_OOO 2011/11/30 19:29:13 This comment seems to be apropos.
Mihai Parparita -not on Chrome 2011/11/30 22:38:47 Added TYPE_SHELL to the list of types tested, and
97 TYPE_TABBED = 1, 97 TYPE_TABBED = 1,
98 TYPE_POPUP = 2, 98 TYPE_POPUP = 2,
99 TYPE_PANEL = 3, 99 TYPE_PANEL = 3,
100 TYPE_SHELL = 4
100 }; 101 };
101 102
102 // Possible elements of the Browser window. 103 // Possible elements of the Browser window.
103 enum WindowFeature { 104 enum WindowFeature {
104 FEATURE_NONE = 0, 105 FEATURE_NONE = 0,
105 FEATURE_TITLEBAR = 1, 106 FEATURE_TITLEBAR = 1,
106 FEATURE_TABSTRIP = 2, 107 FEATURE_TABSTRIP = 2,
107 FEATURE_TOOLBAR = 4, 108 FEATURE_TOOLBAR = 4,
108 FEATURE_LOCATIONBAR = 8, 109 FEATURE_LOCATIONBAR = 8,
109 FEATURE_BOOKMARKBAR = 16, 110 FEATURE_BOOKMARKBAR = 16,
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 void OnAcceptFullscreenPermission(const GURL& url, 848 void OnAcceptFullscreenPermission(const GURL& url,
848 FullscreenExitBubbleType bubble_type); 849 FullscreenExitBubbleType bubble_type);
849 void OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type); 850 void OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type);
850 851
851 // Figure out if there are tabs that have beforeunload handlers. 852 // Figure out if there are tabs that have beforeunload handlers.
852 bool TabsNeedBeforeUnloadFired(); 853 bool TabsNeedBeforeUnloadFired();
853 854
854 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 855 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
855 bool is_type_popup() const { return type_ == TYPE_POPUP; } 856 bool is_type_popup() const { return type_ == TYPE_POPUP; }
856 bool is_type_panel() const { return type_ == TYPE_PANEL; } 857 bool is_type_panel() const { return type_ == TYPE_PANEL; }
858 bool is_type_shell() const { return type_ == TYPE_SHELL; }
857 859
858 bool is_app() const; 860 bool is_app() const;
859 bool is_devtools() const; 861 bool is_devtools() const;
860 862
861 // True when the current tab is in fullscreen mode, requested by 863 // True when the current tab is in fullscreen mode, requested by
862 // webkitRequestFullScreen. 864 // webkitRequestFullScreen.
863 bool IsFullscreenForTab() const; 865 bool IsFullscreenForTab() const;
864 866
865 // Called each time the browser window is shown. 867 // Called each time the browser window is shown.
866 void OnWindowDidShow(); 868 void OnWindowDidShow();
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 1434
1433 scoped_refptr<FullscreenController> fullscreen_controller_; 1435 scoped_refptr<FullscreenController> fullscreen_controller_;
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

Powered by Google App Engine
This is Rietveld 408576698