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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "content/public/common/page_transition_types.h" 49 #include "content/public/common/page_transition_types.h"
50 #include "content/public/common/page_zoom.h" 50 #include "content/public/common/page_zoom.h"
51 #include "ui/base/ui_base_types.h" 51 #include "ui/base/ui_base_types.h"
52 #include "ui/gfx/rect.h" 52 #include "ui/gfx/rect.h"
53 53
54 class BrowserContentSettingBubbleModelDelegate; 54 class BrowserContentSettingBubbleModelDelegate;
55 class BrowserSyncedWindowDelegate; 55 class BrowserSyncedWindowDelegate;
56 class BrowserToolbarModelDelegate; 56 class BrowserToolbarModelDelegate;
57 class BrowserTabRestoreServiceDelegate; 57 class BrowserTabRestoreServiceDelegate;
58 class BrowserWindow; 58 class BrowserWindow;
59 class Extension;
60 class ExtensionWindowController; 59 class ExtensionWindowController;
61 class FindBarController; 60 class FindBarController;
62 class FullscreenController; 61 class FullscreenController;
63 class InstantController; 62 class InstantController;
64 class InstantUnloadHandler; 63 class InstantUnloadHandler;
65 class PrefService; 64 class PrefService;
66 class Profile; 65 class Profile;
67 class SkBitmap; 66 class SkBitmap;
68 class StatusBubble; 67 class StatusBubble;
69 class TabNavigation; 68 class TabNavigation;
70 class TabStripModel; 69 class TabStripModel;
71 struct WebApplicationInfo; 70 struct WebApplicationInfo;
72 class WebDialogDelegate; 71 class WebDialogDelegate;
73 72
74 namespace content { 73 namespace content {
75 class NavigationController; 74 class NavigationController;
76 class SessionStorageNamespace; 75 class SessionStorageNamespace;
77 } 76 }
78 77
78 namespace extensions {
79 class Extension;
80 }
81
79 namespace gfx { 82 namespace gfx {
80 class Point; 83 class Point;
81 } 84 }
82 85
83 class Browser : public TabStripModelDelegate, 86 class Browser : public TabStripModelDelegate,
84 public TabStripModelObserver, 87 public TabStripModelObserver,
85 public content::WebContentsDelegate, 88 public content::WebContentsDelegate,
86 public CoreTabHelperDelegate, 89 public CoreTabHelperDelegate,
87 public SearchEngineTabHelperDelegate, 90 public SearchEngineTabHelperDelegate,
88 public ConstrainedWindowTabHelperDelegate, 91 public ConstrainedWindowTabHelperDelegate,
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 // Opens the specified URL in a new browser window in an incognito session. 286 // Opens the specified URL in a new browser window in an incognito session.
284 // If there is already an existing active incognito session for the specified 287 // If there is already an existing active incognito session for the specified
285 // |profile|, that session is re-used. 288 // |profile|, that session is re-used.
286 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); 289 static void OpenURLOffTheRecord(Profile* profile, const GURL& url);
287 290
288 // Open |extension| in |container|, using |disposition| if container type is 291 // Open |extension| in |container|, using |disposition| if container type is
289 // TAB. Returns the WebContents* that was created or NULL. If non-empty, 292 // TAB. Returns the WebContents* that was created or NULL. If non-empty,
290 // |override_url| is used in place of the app launch url. 293 // |override_url| is used in place of the app launch url.
291 static content::WebContents* OpenApplication( 294 static content::WebContents* OpenApplication(
292 Profile* profile, 295 Profile* profile,
293 const Extension* extension, 296 const extensions::Extension* extension,
294 extension_misc::LaunchContainer container, 297 extension_misc::LaunchContainer container,
295 const GURL& override_url, 298 const GURL& override_url,
296 WindowOpenDisposition disposition); 299 WindowOpenDisposition disposition);
297 300
298 #if defined(USE_ASH) 301 #if defined(USE_ASH)
299 // Opens |url| in a new application panel window for the specified url. 302 // Opens |url| in a new application panel window for the specified url.
300 static content::WebContents* OpenApplicationPanel( 303 static content::WebContents* OpenApplicationPanel(
301 Profile* profile, 304 Profile* profile,
302 const Extension* extension, 305 const extensions::Extension* extension,
303 const GURL& url); 306 const GURL& url);
304 #endif 307 #endif
305 308
306 // Opens a new application window for the specified url. If |as_panel| 309 // Opens a new application window for the specified url. If |as_panel|
307 // is true, the application will be opened as a Browser::Type::APP_PANEL in 310 // is true, the application will be opened as a Browser::Type::APP_PANEL in
308 // app panel window, otherwise it will be opened as as either 311 // app panel window, otherwise it will be opened as as either
309 // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or 312 // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or
310 // Browser::Type::EXTENSION_APP (if |extension| is non-NULL). 313 // Browser::Type::EXTENSION_APP (if |extension| is non-NULL).
311 // If |app_browser| is not NULL, it is set to the browser that hosts the 314 // If |app_browser| is not NULL, it is set to the browser that hosts the
312 // returned tab. 315 // returned tab.
313 static content::WebContents* OpenApplicationWindow( 316 static content::WebContents* OpenApplicationWindow(
314 Profile* profile, 317 Profile* profile,
315 const Extension* extension, 318 const extensions::Extension* extension,
316 extension_misc::LaunchContainer container, 319 extension_misc::LaunchContainer container,
317 const GURL& url, 320 const GURL& url,
318 Browser** app_browser); 321 Browser** app_browser);
319 322
320 // Open |url| in an app shortcut window. If |update_shortcut| is true, 323 // Open |url| in an app shortcut window. If |update_shortcut| is true,
321 // update the name, description, and favicon of the shortcut. 324 // update the name, description, and favicon of the shortcut.
322 // There are two kinds of app shortcuts: Shortcuts to a URL, 325 // There are two kinds of app shortcuts: Shortcuts to a URL,
323 // and shortcuts that open an installed application. This function 326 // and shortcuts that open an installed application. This function
324 // is used to open the former. To open the latter, use 327 // is used to open the former. To open the latter, use
325 // Browser::OpenApplicationWindow(). 328 // Browser::OpenApplicationWindow().
326 static content::WebContents* OpenAppShortcutWindow(Profile* profile, 329 static content::WebContents* OpenAppShortcutWindow(Profile* profile,
327 const GURL& url, 330 const GURL& url,
328 bool update_shortcut); 331 bool update_shortcut);
329 332
330 // Open an application for |extension| using |disposition|. Returns NULL if 333 // Open an application for |extension| using |disposition|. Returns NULL if
331 // there are no appropriate existing browser windows for |profile|. If 334 // there are no appropriate existing browser windows for |profile|. If
332 // non-empty, |override_url| is used in place of the app launch url. 335 // non-empty, |override_url| is used in place of the app launch url.
333 static content::WebContents* OpenApplicationTab( 336 static content::WebContents* OpenApplicationTab(
334 Profile* profile, 337 Profile* profile,
335 const Extension* extension, 338 const extensions::Extension* extension,
336 const GURL& override_url, 339 const GURL& override_url,
337 WindowOpenDisposition disposition); 340 WindowOpenDisposition disposition);
338 341
339 // Opens a new window and opens the bookmark manager. 342 // Opens a new window and opens the bookmark manager.
340 static void OpenBookmarkManagerWindow(Profile* profile); 343 static void OpenBookmarkManagerWindow(Profile* profile);
341 344
342 #if defined(OS_MACOSX) 345 #if defined(OS_MACOSX)
343 // Open a new window with history/downloads/help/options (needed on Mac when 346 // Open a new window with history/downloads/help/options (needed on Mac when
344 // there are no windows). 347 // there are no windows).
345 static void OpenAboutWindow(Profile* profile); 348 static void OpenAboutWindow(Profile* profile);
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 bool window_has_shown_; 1463 bool window_has_shown_;
1461 1464
1462 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1465 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1463 // before DidEndColorChooser is called. 1466 // before DidEndColorChooser is called.
1464 scoped_ptr<content::ColorChooser> color_chooser_; 1467 scoped_ptr<content::ColorChooser> color_chooser_;
1465 1468
1466 DISALLOW_COPY_AND_ASSIGN(Browser); 1469 DISALLOW_COPY_AND_ASSIGN(Browser);
1467 }; 1470 };
1468 1471
1469 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1472 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/message_box_handler.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698