summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 21:17:57 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 21:17:57 +0000
commit702f24a84fce3bf05fd68d947ecb5d50acab56f5 (patch)
tree31bba58a6afc81bf44164bb53005a1639d5ba939 /native_client_sdk
parenta8c9c916be247e886ec35a5df03a04032e5fc28c (diff)
downloadchromium_src-702f24a84fce3bf05fd68d947ecb5d50acab56f5.zip
chromium_src-702f24a84fce3bf05fd68d947ecb5d50acab56f5.tar.gz
chromium_src-702f24a84fce3bf05fd68d947ecb5d50acab56f5.tar.bz2
[NaCl SDK Docs] Specify default paths to Chrome on various platforms
The TODO was to reference the default paths to Chrome for different operating systems. On Mac, this is important to call out because you have to point to the executable inside the application bundle. BUG=none R=sbc@chromium.org, eliben@chromium.org Review URL: https://codereview.chromium.org/51893005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/doc/sdk/examples.rst26
1 files changed, 18 insertions, 8 deletions
diff --git a/native_client_sdk/src/doc/sdk/examples.rst b/native_client_sdk/src/doc/sdk/examples.rst
index 22404d4..a0b567a 100644
--- a/native_client_sdk/src/doc/sdk/examples.rst
+++ b/native_client_sdk/src/doc/sdk/examples.rst
@@ -184,20 +184,30 @@ this::
Set the CHROME_PATH environment variable to the location of your Chrome
executable.
-On Windows::
+* On Windows:
- > set CHROME_PATH=<Path to chrome.exe>
+ The default install location of Chrome is
+ ``C:\Program Files (x86)\Google\Chrome\Application\chrome.exe`` for Chrome
+ stable and
+ ``C:\Users\<username>\AppData\Local\Google\Chrome SxS\Application\chrome.exe``
+ for Chrome Canary; try looking in those directories first::
-On Linux::
+ > set CHROME_PATH=<Path to chrome.exe>
- $ export CHROME_PATH=<Path to google-chrome>
+* On Linux::
-On Mac::
+ $ export CHROME_PATH=<Path to google-chrome>
- $ export CHROME_PATH=<Path to chrome>
+* On Mac:
-.. **TODO(binji):** use default Chrome paths here, especially
-.. important for Mac:
+ The default install location of Chrome is
+ ``/Applications/Google Chrome.app/Contents/MacOS/Google Chrome`` for
+ Chrome Stable and
+ ``Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary``
+ for Chrome Canary. Note that you have to reference the executable inside the
+ application bundle, not the top-level ``.app`` directory::
+
+ $ export CHROME_PATH=<Path to Google Chrome>
You can run via a different toolchain or configuration by using the
``TOOLCHAIN`` and ``CONFIG`` parameters to make::