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

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

Issue 10332071: Pass command line arguments onto platform apps which provide the right intent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad merge 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 | Annotate | Revision Log
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 CommandLine;
59 class Extension; 60 class Extension;
60 class ExtensionWindowController; 61 class ExtensionWindowController;
61 class FindBarController; 62 class FindBarController;
62 class FullscreenController; 63 class FullscreenController;
63 class InstantController; 64 class InstantController;
64 class InstantUnloadHandler; 65 class InstantUnloadHandler;
65 class PrefService; 66 class PrefService;
66 class Profile; 67 class Profile;
67 class SkBitmap; 68 class SkBitmap;
68 class StatusBubble; 69 class StatusBubble;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // Opens a new window with the tabs from |profile|'s TabRestoreService. 281 // Opens a new window with the tabs from |profile|'s TabRestoreService.
281 static void OpenWindowWithRestoredTabs(Profile* profile); 282 static void OpenWindowWithRestoredTabs(Profile* profile);
282 283
283 // Opens the specified URL in a new browser window in an incognito session. 284 // 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 285 // If there is already an existing active incognito session for the specified
285 // |profile|, that session is re-used. 286 // |profile|, that session is re-used.
286 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); 287 static void OpenURLOffTheRecord(Profile* profile, const GURL& url);
287 288
288 // Open |extension| in |container|, using |disposition| if container type is 289 // Open |extension| in |container|, using |disposition| if container type is
289 // TAB. Returns the WebContents* that was created or NULL. If non-empty, 290 // TAB. Returns the WebContents* that was created or NULL. If non-empty,
290 // |override_url| is used in place of the app launch url. 291 // |override_url| is used in place of the app launch url. Pass relevant
292 // information in |command_line| onto platform app as launch data.
293 // |command_line| can be NULL, indicating there is no launch data to pass on.
291 static content::WebContents* OpenApplication( 294 static content::WebContents* OpenApplication(
Mihai Parparita -not on Chrome 2012/05/15 00:39:28 This can be in a follow-up cleanup CL, but OpenApp
benwells 2012/05/18 03:36:02 Agreed. Have added TODO.
292 Profile* profile, 295 Profile* profile,
293 const Extension* extension, 296 const 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,
300 const CommandLine* command_line);
297 301
298 #if defined(USE_ASH) 302 #if defined(USE_ASH)
299 // Opens |url| in a new application panel window for the specified url. 303 // Opens |url| in a new application panel window for the specified url.
300 static content::WebContents* OpenApplicationPanel( 304 static content::WebContents* OpenApplicationPanel(
301 Profile* profile, 305 Profile* profile,
302 const Extension* extension, 306 const Extension* extension,
303 const GURL& url); 307 const GURL& url);
304 #endif 308 #endif
305 309
306 // Opens a new application window for the specified url. If |as_panel| 310 // Opens a new application window for the specified url. If |as_panel|
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 bool window_has_shown_; 1487 bool window_has_shown_;
1484 1488
1485 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1489 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1486 // before DidEndColorChooser is called. 1490 // before DidEndColorChooser is called.
1487 scoped_ptr<content::ColorChooser> color_chooser_; 1491 scoped_ptr<content::ColorChooser> color_chooser_;
1488 1492
1489 DISALLOW_COPY_AND_ASSIGN(Browser); 1493 DISALLOW_COPY_AND_ASSIGN(Browser);
1490 }; 1494 };
1491 1495
1492 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1496 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698