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

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

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix
Patch Set: fix linux unit tests Created 7 years, 2 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_SHELL_INTEGRATION_H_ 5 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
6 #define CHROME_BROWSER_SHELL_INTEGRATION_H_ 6 #define CHROME_BROWSER_SHELL_INTEGRATION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 base::FilePath extension_path; 103 base::FilePath extension_path;
104 gfx::ImageFamily favicon; 104 gfx::ImageFamily favicon;
105 base::FilePath profile_path; 105 base::FilePath profile_path;
106 std::string profile_name; 106 std::string profile_name;
107 }; 107 };
108 108
109 // Info about which locations to create app shortcuts in. 109 // Info about which locations to create app shortcuts in.
110 struct ShortcutLocations { 110 struct ShortcutLocations {
111 ShortcutLocations(); 111 ShortcutLocations();
112 112
113 bool InApplicationsMenu() const {
114 return in_applications_menu_root || in_applications_menu_chrome_subdir ||
115 in_applications_menu_chrome_apps_subdir;
116 }
117
113 bool on_desktop; 118 bool on_desktop;
114 bool in_applications_menu; 119
115 string16 applications_menu_subdir; 120 // For Windows, these refer to "Start Menu", "Start Menu/Google Chrome",
121 // and "Start Menu/Chrome Apps" respectively.
122 bool in_applications_menu_root;
123 bool in_applications_menu_chrome_subdir;
124 bool in_applications_menu_chrome_apps_subdir;
gab 2013/10/03 17:22:49 I don't think we ever need more than 1 of those at
calamity 2013/10/14 02:24:25 Done.
116 125
117 // For Windows, this refers to quick launch bar prior to Win7. In Win7, 126 // For Windows, this refers to quick launch bar prior to Win7. In Win7,
118 // this means "pin to taskbar". For Mac/Linux, this could be used for 127 // this means "pin to taskbar". For Mac/Linux, this could be used for
119 // Mac dock or the gnome/kde application launcher. However, those are not 128 // Mac dock or the gnome/kde application launcher. However, those are not
120 // implemented yet. 129 // implemented yet.
121 bool in_quick_launch_bar; 130 bool in_quick_launch_bar;
122 131
123 // For Linux, this refers to a shortcut which the system knows about (for 132 // For Linux, this refers to a shortcut which the system knows about (for
124 // the purpose of identifying windows and giving them the correct 133 // the purpose of identifying windows and giving them the correct
125 // title/icon), but which does not show up in menus or search results. 134 // title/icon), but which does not show up in menus or search results.
126 // Ignored if in_applications_menu == true. 135 // Ignored if InApplicationsMenu() == true.
127 bool hidden; 136 bool hidden;
128 }; 137 };
129 138
130 // Data that needs to be passed between the app launcher stub and Chrome. 139 // Data that needs to be passed between the app launcher stub and Chrome.
131 struct AppModeInfo { 140 struct AppModeInfo {
132 }; 141 };
133 static void SetAppModeInfo(const AppModeInfo* info); 142 static void SetAppModeInfo(const AppModeInfo* info);
134 static const AppModeInfo* AppModeInfo(); 143 static const AppModeInfo* AppModeInfo();
135 144
136 // Is the current instance of Chrome running in App mode. 145 // Is the current instance of Chrome running in App mode.
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 // Set Chrome as the default handler for this protocol. 335 // Set Chrome as the default handler for this protocol.
327 virtual bool SetAsDefault(bool interactive_permitted) OVERRIDE; 336 virtual bool SetAsDefault(bool interactive_permitted) OVERRIDE;
328 337
329 std::string protocol_; 338 std::string protocol_;
330 339
331 DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker); 340 DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker);
332 }; 341 };
333 }; 342 };
334 343
335 #endif // CHROME_BROWSER_SHELL_INTEGRATION_H_ 344 #endif // CHROME_BROWSER_SHELL_INTEGRATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698