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

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

Issue 6881073: Cleanup popup related browser navigation code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and merge with avi's popup block changes. Created 9 years, 7 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
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // be called after configuration for window() to be valid. 130 // be called after configuration for window() to be valid.
131 // Avoid using this constructor directly if you can use one of the Create*() 131 // Avoid using this constructor directly if you can use one of the Create*()
132 // methods below. This applies to almost all non-testing code. 132 // methods below. This applies to almost all non-testing code.
133 Browser(Type type, Profile* profile); 133 Browser(Type type, Profile* profile);
134 virtual ~Browser(); 134 virtual ~Browser();
135 135
136 // Creates a normal tabbed browser with the specified profile. The Browser's 136 // Creates a normal tabbed browser with the specified profile. The Browser's
137 // window is created by this function call. 137 // window is created by this function call.
138 static Browser* Create(Profile* profile); 138 static Browser* Create(Profile* profile);
139 139
140 // Like Create, but creates a browser of the specified (popup) type, with the
141 // specified contents, in a popup window of the specified size/position.
142 static Browser* CreateForPopup(Type type, Profile* profile,
143 TabContents* new_contents,
144 const gfx::Rect& initial_bounds);
145
146 // Like Create, but creates a browser of the specified type. 140 // Like Create, but creates a browser of the specified type.
147 static Browser* CreateForType(Type type, Profile* profile); 141 static Browser* CreateForType(Type type, Profile* profile);
148 142
149 // Like Create, but creates a toolbar-less "app" window for the specified 143 // Like Create, but creates a toolbar-less "app" window for the specified
150 // app. |app_name| is required and is used to identify the window to the 144 // app. |app_name| is required and is used to identify the window to the
151 // shell. If |extension| is set, it is used to determine the size of the 145 // shell. If |extension| is set, it is used to determine the size of the
152 // window to open. 146 // window to open.
153 static Browser* CreateForApp(const std::string& app_name, 147 static Browser* CreateForApp(const std::string& app_name,
154 const gfx::Size& window_size, 148 const gfx::Size& window_size,
155 Profile* profile, 149 Profile* profile,
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 // Helper which implements the TabRestoreServiceDelegate interface. 1184 // Helper which implements the TabRestoreServiceDelegate interface.
1191 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; 1185 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
1192 1186
1193 scoped_ptr<InstantController> instant_; 1187 scoped_ptr<InstantController> instant_;
1194 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1188 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1195 1189
1196 DISALLOW_COPY_AND_ASSIGN(Browser); 1190 DISALLOW_COPY_AND_ASSIGN(Browser);
1197 }; 1191 };
1198 1192
1199 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1193 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698