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

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

Issue 114263005: Convert Extension* to extension id in AppLaunchParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile Created 7 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
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_EXTENSIONS_APPLICATION_LAUNCH_H_ 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_
6 #define CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ 6 #define CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_
7 7
8 #include "base/command_line.h"
8 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
9 #include "chrome/browser/ui/host_desktop.h" 10 #include "chrome/browser/ui/host_desktop.h"
10 #include "chrome/common/extensions/extension_constants.h" 11 #include "chrome/common/extensions/extension_constants.h"
11 #include "ui/base/window_open_disposition.h" 12 #include "ui/base/window_open_disposition.h"
12 #include "ui/gfx/rect.h" 13 #include "ui/gfx/rect.h"
13 #include "url/gurl.h" 14 #include "url/gurl.h"
14 15
15 class Browser; 16 class Browser;
16 class CommandLine; 17 class CommandLine;
17 class Profile; 18 class Profile;
(...skipping 20 matching lines...) Expand all
38 39
39 // Helper to create AppLaunchParams using event flags that allows user to 40 // Helper to create AppLaunchParams using event flags that allows user to
40 // override the user-configured container using modifier keys, falling back to 41 // override the user-configured container using modifier keys, falling back to
41 // extensions::GetLaunchContainer() with no modifiers. |desktop_type| 42 // extensions::GetLaunchContainer() with no modifiers. |desktop_type|
42 // indicates the desktop upon which to launch (Ash or Native). 43 // indicates the desktop upon which to launch (Ash or Native).
43 AppLaunchParams(Profile* profile, 44 AppLaunchParams(Profile* profile,
44 const extensions::Extension* extension, 45 const extensions::Extension* extension,
45 int event_flags, 46 int event_flags,
46 chrome::HostDesktopType desktop_type); 47 chrome::HostDesktopType desktop_type);
47 48
49 ~AppLaunchParams();
50
48 // The profile to load the application from. 51 // The profile to load the application from.
49 Profile* profile; 52 Profile* profile;
50 53
51 // The extension to load. 54 // The extension to load.
52 const extensions::Extension* extension; 55 std::string extension_id;
53 56
54 // The container type to launch the application in. 57 // The container type to launch the application in.
55 extensions::LaunchContainer container; 58 extensions::LaunchContainer container;
56 59
57 // If container is TAB, this field controls how the tab is opened. 60 // If container is TAB, this field controls how the tab is opened.
58 WindowOpenDisposition disposition; 61 WindowOpenDisposition disposition;
59 62
60 // The desktop type to launch on. Uses GetActiveDesktop() if unspecified. 63 // The desktop type to launch on. Uses GetActiveDesktop() if unspecified.
61 chrome::HostDesktopType desktop_type; 64 chrome::HostDesktopType desktop_type;
62 65
63 // If non-empty, use override_url in place of the application's launch url. 66 // If non-empty, use override_url in place of the application's launch url.
64 GURL override_url; 67 GURL override_url;
65 68
66 // If non-empty, use override_boudns in place of the application's default 69 // If non-empty, use override_boudns in place of the application's default
67 // position and dimensions. 70 // position and dimensions.
68 gfx::Rect override_bounds; 71 gfx::Rect override_bounds;
69 72
70 // If non-NULL, information from the command line may be passed on to the 73 // If non-empty, information from the command line may be passed on to the
71 // application. 74 // application.
72 const CommandLine* command_line; 75 CommandLine command_line;
73 76
74 // If non-empty, the current directory from which any relative paths on the 77 // If non-empty, the current directory from which any relative paths on the
75 // command line should be expanded from. 78 // command line should be expanded from.
76 base::FilePath current_directory; 79 base::FilePath current_directory;
77 }; 80 };
78 81
79 // Opens the application, possibly prompting the user to re-enable it. 82 // Opens the application, possibly prompting the user to re-enable it.
80 void OpenApplicationWithReenablePrompt(const AppLaunchParams& params); 83 void OpenApplicationWithReenablePrompt(const AppLaunchParams& params);
81 84
82 // Open the application in a way specified by |params|. 85 // Open the application in a way specified by |params|.
83 content::WebContents* OpenApplication(const AppLaunchParams& params); 86 content::WebContents* OpenApplication(const AppLaunchParams& params);
84 87
85 // Open |url| in an app shortcut window. |override_bounds| param is optional. 88 // Open |url| in an app shortcut window. |override_bounds| param is optional.
86 // There are two kinds of app shortcuts: Shortcuts to a URL, 89 // There are two kinds of app shortcuts: Shortcuts to a URL,
87 // and shortcuts that open an installed application. This function 90 // and shortcuts that open an installed application. This function
88 // is used to open the former. To open the latter, use 91 // is used to open the former. To open the latter, use
89 // application_launch::OpenApplication(). 92 // application_launch::OpenApplication().
90 content::WebContents* OpenAppShortcutWindow(Profile* profile, 93 content::WebContents* OpenAppShortcutWindow(Profile* profile,
91 const GURL& url, 94 const GURL& url,
92 const gfx::Rect& override_bounds); 95 const gfx::Rect& override_bounds);
93 96
94 #endif // CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_ 97 #endif // CHROME_BROWSER_UI_EXTENSIONS_APPLICATION_LAUNCH_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698