| OLD | NEW |
| 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 Loading... |
| 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 CommandLine; |
| 59 class ExtensionWindowController; | 60 class ExtensionWindowController; |
| 60 class FindBarController; | 61 class FindBarController; |
| 61 class FullscreenController; | 62 class FullscreenController; |
| 62 class InstantController; | 63 class InstantController; |
| 63 class InstantUnloadHandler; | 64 class InstantUnloadHandler; |
| 64 class PrefService; | 65 class PrefService; |
| 65 class Profile; | 66 class Profile; |
| 66 class SkBitmap; | 67 class SkBitmap; |
| 67 class StatusBubble; | 68 class StatusBubble; |
| 68 class TabNavigation; | 69 class TabNavigation; |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 // Opens a new window with the tabs from |profile|'s TabRestoreService. | 284 // Opens a new window with the tabs from |profile|'s TabRestoreService. |
| 284 static void OpenWindowWithRestoredTabs(Profile* profile); | 285 static void OpenWindowWithRestoredTabs(Profile* profile); |
| 285 | 286 |
| 286 // Opens the specified URL in a new browser window in an incognito session. | 287 // Opens the specified URL in a new browser window in an incognito session. |
| 287 // If there is already an existing active incognito session for the specified | 288 // If there is already an existing active incognito session for the specified |
| 288 // |profile|, that session is re-used. | 289 // |profile|, that session is re-used. |
| 289 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); | 290 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); |
| 290 | 291 |
| 291 // Open |extension| in |container|, using |disposition| if container type is | 292 // Open |extension| in |container|, using |disposition| if container type is |
| 292 // TAB. Returns the WebContents* that was created or NULL. If non-empty, | 293 // TAB. Returns the WebContents* that was created or NULL. If non-empty, |
| 293 // |override_url| is used in place of the app launch url. | 294 // |override_url| is used in place of the app launch url. Pass relevant |
| 295 // information in |command_line| onto platform app as launch data. |
| 296 // |command_line| can be NULL, indicating there is no launch data to pass on. |
| 297 // TODO(benwells): Put the parameters to this into an ApplicationLaunchParams |
| 298 // struct. |
| 294 static content::WebContents* OpenApplication( | 299 static content::WebContents* OpenApplication( |
| 295 Profile* profile, | 300 Profile* profile, |
| 296 const extensions::Extension* extension, | 301 const extensions::Extension* extension, |
| 297 extension_misc::LaunchContainer container, | 302 extension_misc::LaunchContainer container, |
| 298 const GURL& override_url, | 303 const GURL& override_url, |
| 299 WindowOpenDisposition disposition); | 304 WindowOpenDisposition disposition, |
| 305 const CommandLine* command_line); |
| 300 | 306 |
| 301 #if defined(USE_ASH) | 307 #if defined(USE_ASH) |
| 302 // Opens |url| in a new application panel window for the specified url. | 308 // Opens |url| in a new application panel window for the specified url. |
| 303 static content::WebContents* OpenApplicationPanel( | 309 static content::WebContents* OpenApplicationPanel( |
| 304 Profile* profile, | 310 Profile* profile, |
| 305 const extensions::Extension* extension, | 311 const extensions::Extension* extension, |
| 306 const GURL& url); | 312 const GURL& url); |
| 307 #endif | 313 #endif |
| 308 | 314 |
| 309 // Opens a new application window for the specified url. If |as_panel| | 315 // Opens a new application window for the specified url. If |as_panel| |
| (...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1463 bool window_has_shown_; | 1469 bool window_has_shown_; |
| 1464 | 1470 |
| 1465 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1471 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1466 // before DidEndColorChooser is called. | 1472 // before DidEndColorChooser is called. |
| 1467 scoped_ptr<content::ColorChooser> color_chooser_; | 1473 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1468 | 1474 |
| 1469 DISALLOW_COPY_AND_ASSIGN(Browser); | 1475 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1470 }; | 1476 }; |
| 1471 | 1477 |
| 1472 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1478 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |