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

Unified Diff: chrome/browser/web_applications/web_app_mac.mm

Issue 14579006: Start app shim when app launched. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/web_applications/web_app_mac.mm
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
index 5c933cd5239e7f8d4d1ba6460265ca76067acf2a..f63ab1a5cef5c8e0597455428a63e1d209bf26e7 100644
--- a/chrome/browser/web_applications/web_app_mac.mm
+++ b/chrome/browser/web_applications/web_app_mac.mm
@@ -6,16 +6,21 @@
#import <Cocoa/Cocoa.h>
+#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
+#include "base/mac/launch_services_util.h"
#include "base/mac/mac_logging.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/mac/app_mode_common.h"
@@ -300,6 +305,26 @@ base::FilePath GetAppInstallPath(
return shortcut_creator.GetShortcutPath();
}
+void LaunchShimOnFileThread(Profile* profile,
tapted 2013/05/29 04:20:30 can you move this to an anonymous namespace?
jackhou1 2013/05/29 05:53:04 Done.
+ const extensions::Extension* extension) {
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+ base::FilePath shim_path = GetAppInstallPath(
+ web_app::ShortcutInfoForExtensionAndProfile(extension, profile));
+ if (shim_path.empty())
+ return;
+
+ CommandLine command_line(CommandLine::NO_PROGRAM);
+ command_line.AppendSwitch(app_mode::kNoLaunchApp);
+ base::mac::OpenApplicationWithPath(shim_path, command_line, NULL);
+}
+
+void MaybeLaunchShortcut(Profile* profile,
+ const extensions::Extension* extension) {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::FILE, FROM_HERE,
+ base::Bind(&LaunchShimOnFileThread, profile, extension));
tapted 2013/05/29 04:20:30 I've just realised.. posting Extension pointers to
jackhou1 2013/05/29 05:53:04 Done. Changed MaybeCreateShortcut since chrome/br
+}
+
namespace internals {
base::FilePath GetAppBundleByExtensionId(std::string extension_id) {

Powered by Google App Engine
This is Rietveld 408576698