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

Side by Side Diff: chrome/app/chrome_dll_app_mode_mac.mm

Issue 2066004: Mac: app mode loader (shim). (Closed)
Patch Set: more changes per mark + merged ToT Created 10 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
« no previous file with comments | « chrome/app/app_mode_loader_mac.mm ('k') | chrome/app/framework.order » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 // On Mac, one can't make shortcuts with command-line arguments. Instead, we
6 // produce small app bundles which locate the Chromium framework and load it,
7 // passing the appropriate data. This is the entry point into the framework for
8 // those app bundles.
9
10 #include <string> // TODO(viettrungluu): only needed for temporary hack
11
12 #include "base/basictypes.h"
13 #include "base/file_path.h"
14 #include "base/logging.h"
15 #include "chrome/common/app_mode_common_mac.h"
16 #include "chrome/common/chrome_paths_internal.h"
17
18 extern "C" {
19
20 // |ChromeAppModeStart()| is the point of entry into the framework from the app
21 // mode loader.
22 __attribute__((visibility("default")))
23 int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info);
24
25 // TODO(viettrungluu): put this in a header file somewhere.
26 int ChromeMain(int argc, char** argv);
27
28 } // extern "C"
29
30 int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {
31 if (info->major_version < app_mode::kCurrentChromeAppModeInfoMajorVersion) {
32 RAW_LOG(ERROR, "App Mode Loader too old.");
33 return 1;
34 }
35 if (info->major_version > app_mode::kCurrentChromeAppModeInfoMajorVersion) {
36 RAW_LOG(ERROR, "Browser Framework too old to load App Shortcut.");
37 return 1;
38 }
39
40 RAW_CHECK(info->chrome_versioned_path);
41 FilePath* chrome_versioned_path = new FilePath(info->chrome_versioned_path);
42 RAW_CHECK(!chrome_versioned_path->empty());
43 chrome::SetOverrideVersionedDirectory(chrome_versioned_path);
44
45 // TODO(viettrungluu): do something intelligent with data
46 // return ChromeMain(info->argc, info->argv);
47 // For now, a cheesy hack instead.
48 RAW_CHECK(info->app_mode_url);
49 std::string argv1(std::string("--app=") + info->app_mode_url);
50 RAW_CHECK(info->app_mode_id);
51 std::string argv2(std::string("--user-data-dir=/tmp/") + info->app_mode_id);
52 char* argv[] = { info->argv[0],
53 const_cast<char*>(argv1.c_str()),
54 const_cast<char*>(argv2.c_str()) };
55 return ChromeMain(static_cast<int>(arraysize(argv)), argv);
56 }
OLDNEW
« no previous file with comments | « chrome/app/app_mode_loader_mac.mm ('k') | chrome/app/framework.order » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698