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

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: Rebase 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
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest.cc ('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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 public: 92 public:
93 // SessionService::WindowType mirrors these values. If you add to this 93 // SessionService::WindowType mirrors these values. If you add to this
94 // enum, look at SessionService::WindowType to see if it needs to be 94 // enum, look at SessionService::WindowType to see if it needs to be
95 // updated. 95 // updated.
96 enum Type { 96 enum Type {
97 // If you add a new type, consider updating the test 97 // If you add a new type, consider updating the test
98 // BrowserTest.StartMaximized. 98 // BrowserTest.StartMaximized.
99 TYPE_TABBED = 1, 99 TYPE_TABBED = 1,
100 TYPE_POPUP = 2, 100 TYPE_POPUP = 2,
101 TYPE_PANEL = 3, 101 TYPE_PANEL = 3,
102 TYPE_SHELL = 4
102 }; 103 };
103 104
104 // Possible elements of the Browser window. 105 // Possible elements of the Browser window.
105 enum WindowFeature { 106 enum WindowFeature {
106 FEATURE_NONE = 0, 107 FEATURE_NONE = 0,
107 FEATURE_TITLEBAR = 1, 108 FEATURE_TITLEBAR = 1,
108 FEATURE_TABSTRIP = 2, 109 FEATURE_TABSTRIP = 2,
109 FEATURE_TOOLBAR = 4, 110 FEATURE_TOOLBAR = 4,
110 FEATURE_LOCATIONBAR = 8, 111 FEATURE_LOCATIONBAR = 8,
111 FEATURE_BOOKMARKBAR = 16, 112 FEATURE_BOOKMARKBAR = 16,
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 void OnAcceptFullscreenPermission(const GURL& url, 850 void OnAcceptFullscreenPermission(const GURL& url,
850 FullscreenExitBubbleType bubble_type); 851 FullscreenExitBubbleType bubble_type);
851 void OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type); 852 void OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type);
852 853
853 // Figure out if there are tabs that have beforeunload handlers. 854 // Figure out if there are tabs that have beforeunload handlers.
854 bool TabsNeedBeforeUnloadFired(); 855 bool TabsNeedBeforeUnloadFired();
855 856
856 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 857 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
857 bool is_type_popup() const { return type_ == TYPE_POPUP; } 858 bool is_type_popup() const { return type_ == TYPE_POPUP; }
858 bool is_type_panel() const { return type_ == TYPE_PANEL; } 859 bool is_type_panel() const { return type_ == TYPE_PANEL; }
860 bool is_type_shell() const { return type_ == TYPE_SHELL; }
859 861
860 bool is_app() const; 862 bool is_app() const;
861 bool is_devtools() const; 863 bool is_devtools() const;
862 864
863 // True when the current tab is in fullscreen mode, requested by 865 // True when the current tab is in fullscreen mode, requested by
864 // webkitRequestFullScreen. 866 // webkitRequestFullScreen.
865 bool IsFullscreenForTab() const; 867 bool IsFullscreenForTab() const;
866 868
867 // Called each time the browser window is shown. 869 // Called each time the browser window is shown.
868 void OnWindowDidShow(); 870 void OnWindowDidShow();
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 1437
1436 scoped_refptr<FullscreenController> fullscreen_controller_; 1438 scoped_refptr<FullscreenController> fullscreen_controller_;
1437 1439
1438 // True if the browser window has been shown at least once. 1440 // True if the browser window has been shown at least once.
1439 bool window_has_shown_; 1441 bool window_has_shown_;
1440 1442
1441 DISALLOW_COPY_AND_ASSIGN(Browser); 1443 DISALLOW_COPY_AND_ASSIGN(Browser);
1442 }; 1444 };
1443 1445
1444 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1446 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698