summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths.cc
Commit message (Collapse)AuthorAgeFilesLines
* Transition to base/mac/bundle_locations.h step 2jeremy@chromium.org2012-01-191-4/+5
| | | | | | | | | | | Remove MainAppBundle() in favor of FrameworkBundle() and update all callsites + code comments. BUG=None TEST=Code should compile and all unit tests should pass. Review URL: https://chromiumcodereview.appspot.com/9220005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118293 0039d316-1c4b-4281-b951-d872f2087c98
* Add a component installer for Portable NaCl. Registration of installer is ↵jvoung@google.com2011-12-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | hidden behind a commandline flag '--enable-pnacl'. Still some of TODOs: finalize the metadata associated with the CRX, figure out what to do when a NaCl plugin needs Pnacl, but it's not there yet. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2365 TEST= none yet, only manually test: (1) put a pnacl omaha config in the omaha sandbox, pointing at a crx. (2) run out/Debug/chrome --user-data-dir=/tmp/temp_profile/ --enable-pnacl --component-updater-debug=fast-update --apps-gallery-update-url=http://omaha.sandbox.google.com/service/update2/crx check /tmp/temp_profile/PNaCl/0.1.0.X is installed after a few seconds. restart chrome, check that PathService registers /tmp/temp_profile/PNaCl/0.1.0.X soonish. Review URL: http://codereview.chromium.org/8348026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114584 0039d316-1c4b-4281-b951-d872f2087c98
* Register O3D/GTalk PPAPI plugins if availablejhorwich@chromium.org2011-12-141-0/+20
| | | | | | | | | | BUG=97848 TEST=manual. Check chrome:plugins, run gtalk if plugins available Review URL: http://codereview.chromium.org/8899014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114487 0039d316-1c4b-4281-b951-d872f2087c98
* ui_tests and browser_tests use layout test data.toyoshim@chromium.org2011-11-221-0/+13
| | | | | | | | | | | | | | | | They are stored in chrome/test/data/layout_tests/LayoutTests in svn or old git workflow. and in third_party/WebKit/LayoutTests in new git workflow. This change adds new query key chrome::DIR_LAYOUT_TESTS to PathService::Get(). Using this interface, each test easily get suitable path for their layout tests. BUG=105104 TEST=browser_tests; ui_tests Review URL: http://codereview.chromium.org/8641002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111186 0039d316-1c4b-4281-b951-d872f2087c98
* share all the needed linux code with OpenBSD in chrome and contentrobert.nagy@gmail.com2011-11-111-1/+1
| | | | | | | | | | | | | | disabled code for OpenBSD: - AdjustRendererOOMScore() - SECCOMP_SANDBOX BUG= TEST=compile Review URL: http://codereview.chromium.org/8341052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109679 0039d316-1c4b-4281-b951-d872f2087c98
* Add per-user external extension source for Mac.skerner@chromium.org2011-11-071-1/+1
| | | | | | | | | | | | Doc updates to follow in a sepperate CL. BUG=88975 TEST=Manual: Existing extension service tests cover the external install method. This change declares one more path to search. Review URL: http://codereview.chromium.org/8438072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108876 0039d316-1c4b-4281-b951-d872f2087c98
* Allow generator javascript test files to go anywhere in the source treescr@chromium.org2011-10-221-3/+10
| | | | | | | | | | | | | | - Allow javascript files anywhere in the source tree - specifically in the same directory as the implementation files. - Copy the files to '<(PRODUCT_DIR)/test_data/...' so that cros can copy these where they need to go for cross-platform testing using 'ebuild' R=jhawkins@chromium.org BUG=90907,89337 TEST=browser_tests --gtest_filter=OptionsWebUITest.* Review URL: http://codereview.chromium.org/8333013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106833 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed policy_prefs_ui.py pyauto test on Linux.joaodasilva@chromium.org2011-10-061-2/+0
| | | | | | | | | | | | | The tests were failing because the managed platform provider doesn't exist (on Linux) if /etc/chromium/policies/managed doesn't exist. BUG=99060 TEST=policy_prefs_ui.py passes on all platforms Review URL: http://codereview.chromium.org/8138021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104286 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a couple of typos in external extensions code.mihaip@chromium.org2011-10-041-1/+1
| | | | | | | | R=skerner@chromium.org Review URL: http://codereview.chromium.org/8118023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103930 0039d316-1c4b-4281-b951-d872f2087c98
* Add external extensions json source in proper mac location.skerner@google.com2011-09-221-8/+21
| | | | | | | | | | | The old path will be deprecated once developers have migrated. BUG=67203 TEST=FileUtilTest.IsPathControledByAdmin Review URL: http://codereview.chromium.org/7718021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102274 0039d316-1c4b-4281-b951-d872f2087c98
* Moved from http://codereview.chromium.org/7811020/ (same CL but was on a ↵caitkp@chromium.org2011-09-121-0/+10
| | | | | | | | | | | | | | | | | | | read-only check-out) BUG=94920 -Related: Check in a new CRX: http://codereview.chromium.org/7828014/ Check in a few GYP changes: http://codereview.chromium.org/7827021/ -Modified profile_impl to search for and auto-install apps found in DIR_DEFAULT_APPS when profile created -Added tracking code for number of extension installs and uninstalls and number of webstore visits. Review URL: http://codereview.chromium.org/7839009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100727 0039d316-1c4b-4281-b951-d872f2087c98
* Use chain-loading for Linux nacl_helpermcgrathr@chromium.org2011-09-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the nacl_helper_bootstrap program, dynamically-linked against nacl_helper.so, with a standalone, statically-linked nacl_helper_bootstrap program that loads the dynamic linker, instructing it in turn to load the nacl_helper program (now a PIE rather than a DSO). This avoids two problems with the old scheme: 1. The nacl_helper_bootstrap program remained in the dynamic linker's list of loaded objects, as the main executable, even though the memory where its .dynamic section had been was overwritten with the NaCl untrusted address space. Code that traverses the list of all loaded objects could thus attempt to look at pointers into this part of memory, and be led astray. 2. nacl_helper_bootstrap's large (~1G) bss segment could cause the kernel to refuse to load the program because it didn't think there was enough free memory in the system for so large an allocation of anonymous memory. The bootstrap program is kept very small by avoiding all use of libc (except for memset and integer division routines needed on ARM). It has its own custom start-up code hand-written in assembly and its own custom system call stubs done with hand-written GCC inline asm statements. To avoid the second problem, the bootstrap program no longer has a large bss. Instead, it has a special ELF segment (i.e. PT_LOAD header) that specifies no memory access, and a large (~1G) mapping size from the file. This mapping is way off the end of the file, but the kernel doesn't mind that, and since it's all a file mapping, the kernel does not do its normal memory accounting for consuming a large amount of anonymous memory. Unfortunately, it's impossible to get the linker to produce exactly the right PT_LOAD header by itself. Using a custom linker script, we get the layout exactly how we want it and a PT_LOAD header that is almost right. We then use a build-time helper program to munge one field of the PT_LOAD to make it exactly what we need. BUG= http://code.google.com/p/chromium/issues/detail?id=94147 TEST= hand-tested chromium build R=bradchen@google.com Review URL: http://codereview.chromium.org/7776034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99089 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 98909 - Use chain-loading for Linux nacl_helperjar@chromium.org2011-08-311-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the nacl_helper_bootstrap program, dynamically-linked against nacl_helper.so, with a standalone, statically-linked nacl_helper_bootstrap program that loads the dynamic linker, instructing it in turn to load the nacl_helper program (now a PIE rather than a DSO). This avoids two problems with the old scheme: 1. The nacl_helper_bootstrap program remained in the dynamic linker's list of loaded objects, as the main executable, even though the memory where its .dynamic section had been was overwritten with the NaCl untrusted address space. Code that traverses the list of all loaded objects could thus attempt to look at pointers into this part of memory, and be led astray. 2. nacl_helper_bootstrap's large (~1G) bss segment could cause the kernel to refuse to load the program because it didn't think there was enough free memory in the system for so large an allocation of anonymous memory. The bootstrap program is kept very small by avoiding all use of libc (except for memset and integer division routines needed on ARM). It has its own custom start-up code hand-written in assembly and its own custom system call stubs done with hand-written GCC inline asm statements. To avoid the second problem, the bootstrap program no longer has a large bss. Instead, it has a special ELF segment (i.e. PT_LOAD header) that specifies no memory access, and a large (~1G) mapping size from the file. This mapping is way off the end of the file, but the kernel doesn't mind that, and since it's all a file mapping, the kernel does not do its normal memory accounting for consuming a large amount of anonymous memory. Unfortunately, it's impossible to get the linker to produce exactly the right PT_LOAD header by itself. Using a custom linker script, we get the layout exactly how we want it and a PT_LOAD header that is almost right. We then use a build-time helper program to munge one field of the PT_LOAD to make it exactly what we need. BUG= http://code.google.com/p/chromium/issues/detail?id=94147 TEST= hand-tested chromium build, invoked with --nacl-linux-helper R=bradchen@google.com,mseaborn@chromium.org Review URL: http://codereview.chromium.org/7795010 TBR=mcgrathr@chromium.org Review URL: http://codereview.chromium.org/7811013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98910 0039d316-1c4b-4281-b951-d872f2087c98
* Use chain-loading for Linux nacl_helpermcgrathr@chromium.org2011-08-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the nacl_helper_bootstrap program, dynamically-linked against nacl_helper.so, with a standalone, statically-linked nacl_helper_bootstrap program that loads the dynamic linker, instructing it in turn to load the nacl_helper program (now a PIE rather than a DSO). This avoids two problems with the old scheme: 1. The nacl_helper_bootstrap program remained in the dynamic linker's list of loaded objects, as the main executable, even though the memory where its .dynamic section had been was overwritten with the NaCl untrusted address space. Code that traverses the list of all loaded objects could thus attempt to look at pointers into this part of memory, and be led astray. 2. nacl_helper_bootstrap's large (~1G) bss segment could cause the kernel to refuse to load the program because it didn't think there was enough free memory in the system for so large an allocation of anonymous memory. The bootstrap program is kept very small by avoiding all use of libc (except for memset and integer division routines needed on ARM). It has its own custom start-up code hand-written in assembly and its own custom system call stubs done with hand-written GCC inline asm statements. To avoid the second problem, the bootstrap program no longer has a large bss. Instead, it has a special ELF segment (i.e. PT_LOAD header) that specifies no memory access, and a large (~1G) mapping size from the file. This mapping is way off the end of the file, but the kernel doesn't mind that, and since it's all a file mapping, the kernel does not do its normal memory accounting for consuming a large amount of anonymous memory. Unfortunately, it's impossible to get the linker to produce exactly the right PT_LOAD header by itself. Using a custom linker script, we get the layout exactly how we want it and a PT_LOAD header that is almost right. We then use a build-time helper program to munge one field of the PT_LOAD to make it exactly what we need. BUG= http://code.google.com/p/chromium/issues/detail?id=94147 TEST= hand-tested chromium build, invoked with --nacl-linux-helper R=bradchen@google.com,mseaborn@chromium.org Review URL: http://codereview.chromium.org/7795010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98909 0039d316-1c4b-4281-b951-d872f2087c98
* Reserve 1GB at the base of the address space of linux nacl_helper for Native ↵bradchen@google.com2011-08-171-0/+13
| | | | | | | | | | | | | | | | | | | Client module. Use PathService instead of command line flag to enable helper. Adds a nacl_helper_bootstrap executable that implements the actual space reservation. This is for resubmit of reverted CL 7670011, fixing nacl.gypi for the linux_shared build. See 7670011 and 7599011 for review history. TBR=agl,bradnelson BUG=92964, nativeclient:480 TEST=manual for now Review URL: http://codereview.chromium.org/7655010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97137 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 97056 - Gyp fix for release build.rvargas@google.com2011-08-161-13/+0
| | | | | | | | | | | | | | | | | | Reserve 1GB at the base of the address space of linux nacl_helper for Native Client module. Use PathService instead of command line flag to enable helper. Adds a nacl_helper_bootstrap executable that implements the actual space reservation. See http://codereview.chromium.org/7599011 for extended revision history. This is a gyp fix following a revert. TBR=agl,bradnelson BUG=92964, nativeclient:480 TEST=manual for now Review URL: http://codereview.chromium.org/7670011 TBR=bradchen@google.com Review URL: http://codereview.chromium.org/7671011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97058 0039d316-1c4b-4281-b951-d872f2087c98
* Gyp fix for release build.bradchen@google.com2011-08-161-0/+13
| | | | | | | | | | | | | | | Reserve 1GB at the base of the address space of linux nacl_helper for Native Client module. Use PathService instead of command line flag to enable helper. Adds a nacl_helper_bootstrap executable that implements the actual space reservation. See http://codereview.chromium.org/7599011 for extended revision history. This is a gyp fix following a revert. TBR=agl,bradnelson BUG=92964, nativeclient:480 TEST=manual for now Review URL: http://codereview.chromium.org/7670011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97056 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 97040 - Reserve 1GB at the base address of linux nacl_helper for ↵rvargas@google.com2011-08-161-13/+0
| | | | | | | | | | | | | | | | Native Client. Use PathService instead of command line flag to obtain path for helper. Adds a nacl_helper_bootstrap executable that implements the actual space reservation. BUG=nativeclient:480 TEST=manual for now Review URL: http://codereview.chromium.org/7599011 TBR=bradchen@google.com Review URL: http://codereview.chromium.org/7669004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97042 0039d316-1c4b-4281-b951-d872f2087c98
* Reserve 1GB at the base address of linux nacl_helper for Native Client.bradchen@google.com2011-08-161-0/+13
| | | | | | | | | | | Use PathService instead of command line flag to obtain path for helper. Adds a nacl_helper_bootstrap executable that implements the actual space reservation. BUG=nativeclient:480 TEST=manual for now Review URL: http://codereview.chromium.org/7599011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97040 0039d316-1c4b-4281-b951-d872f2087c98
* Deploy win flapper via component updatercpu@chromium.org2011-08-101-42/+0
| | | | | | | | | | | | | | - Flapper specific installer - a small bug fix on the updater_configurator - wired into chrome startup in browser_init - changes to chrome_paths to override flapper path TEST=see bug BUG=89248 Review URL: http://codereview.chromium.org/7604023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96247 0039d316-1c4b-4281-b951-d872f2087c98
* fix broken tree and an actual bug. thanks clanckcpu@chromium.org2011-07-141-1/+1
| | | | | | | | | | BUG=89248 TEST=none TBR=thakis Review URL: http://codereview.chromium.org/7361009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92459 0039d316-1c4b-4281-b951-d872f2087c98
* Add the path fetching for flappercpu@chromium.org2011-07-141-0/+46
| | | | | | | | BUG=89248 TEST=see bug Review URL: http://codereview.chromium.org/7346029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92458 0039d316-1c4b-4281-b951-d872f2087c98
* Restore path chrome::DIR_EXTERNAL_EXTENSIONS to its old path on Mac OS.skerner@chromium.org2011-07-061-2/+9
| | | | | | | | | | | | Add a TODO to put in a path that doesn't break the signiture of the package. BUG=87136 TEST=Load an external extension from the path documented in "Other dep[loyment options". Review URL: http://codereview.chromium.org/7227020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91636 0039d316-1c4b-4281-b951-d872f2087c98
* app: Get rid of app_paths.[cc,h] files.tfarina@chromium.org2011-06-271-0/+14
| | | | | | | | | | | BUG=72317 TEST=None R=rsesek@chromium.org Review URL: http://codereview.chromium.org/7262020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90651 0039d316-1c4b-4281-b951-d872f2087c98
* Replace many OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, since most of them ↵chromium@hybridsource.org2011-05-281-1/+1
| | | | | | | | apply to non-linux Unix also. Non-linux Unices tested are the BSDs and Solaris. Review URL: http://codereview.chromium.org/3556009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87156 0039d316-1c4b-4281-b951-d872f2087c98
* Move media library path resolution into Chrome path provider.wez@chromium.org2011-03-171-0/+8
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/6537022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78532 0039d316-1c4b-4281-b951-d872f2087c98
* Remove Gears from Chrome.aa@chromium.org2011-03-111-36/+0
| | | | | | | | | | There are probably a few more bits and pieces that can be removed, but I think this is the majority of it. BUG=51934 Review URL: http://codereview.chromium.org/6576020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77888 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Make chrome paths code more consistent and use more constants when ↵thestig@chromium.org2011-02-171-15/+23
| | | | | | | | | | possible. BUG=none TEST=none Review URL: http://codereview.chromium.org/6528028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75289 0039d316-1c4b-4281-b951-d872f2087c98
* Reland 72784danno@chromium.org2011-01-281-1/+1
| | | | | | | | | | | This is the first step to being able to re-constitute policy from a non-generic protobuf in a policy request in a fully automated way (i.e. the code for the process can be generated). The non-generic protobuf is required for automatic merging of policy on the server-side. BUG=68309 TEST=existing policy/provider tests Review URL: http://codereview.chromium.org/6357021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72956 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 72784 - Policy: generate boilerplate policy type and constant code.danno@chromium.org2011-01-271-1/+1
| | | | | | | | | | | | | This is the first step to being able to re-constitute policy from a non-generic protobuf in a policy request in a fully automated way (i.e. the code for the process can be generated). The non-generic protobuf is required for automatic merging of policy on the server-side. BUG=68309 TEST=existing policy/provider tests Review URL: http://codereview.chromium.org/6002015 TBR=danno@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72785 0039d316-1c4b-4281-b951-d872f2087c98
* Policy: generate boilerplate policy type and constant code.danno@chromium.org2011-01-271-1/+1
| | | | | | | | | | | This is the first step to being able to re-constitute policy from a non-generic protobuf in a policy request in a fully automated way (i.e. the code for the process can be generated). The non-generic protobuf is required for automatic merging of policy on the server-side. BUG=68309 TEST=existing policy/provider tests Review URL: http://codereview.chromium.org/6002015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72784 0039d316-1c4b-4281-b951-d872f2087c98
* Add in-profile external_extensions.json file for Chrome OS OEM customization.skerner@chromium.org2011-01-211-0/+8
| | | | | | | | | BUG=57289 TEST=ExtensionServiceTest.ExternalPrefProvider, manualy craete an external_extensions.json file in the new in-profile path. Review URL: http://codereview.chromium.org/6370009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72187 0039d316-1c4b-4281-b951-d872f2087c98
* Fail gracefully if profile Temp dir can not be accessed.skerner@chromium.org2011-01-191-2/+1
| | | | | | | | | BUG=60634, 67627 TEST=Manually interfere with Temp directory creation, see that expected failures happen. Review URL: http://codereview.chromium.org/6297003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71788 0039d316-1c4b-4281-b951-d872f2087c98
* Move base/mac_util.h to base/mac and use the base::mac namespace.brettw@chromium.org2011-01-011-6/+6
| | | | | | | | | | | Fix up callers to use the new location & namespace. Remove includes from  files where it wasn't necessary. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6046009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70359 0039d316-1c4b-4281-b951-d872f2087c98
* Add path for NaCl pepper2 based plugin.abarth@chromium.org2010-12-151-0/+12
| | | | | | | | | | | | BUG= http://code.google.com/p/nativeclient/issues/detail?id=933 TEST=none Original patch by Noel Allen. Review URL: http://codereview.chromium.org/5740007/ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69285 0039d316-1c4b-4281-b951-d872f2087c98
* Dynamic policy refresh support for the Mac.mnissler@chromium.org2010-10-291-0/+14
| | | | | | | | | | | Adapt the file watching code we already had for ConfigDirPolicyProvider to support a loader delegate, make the old code use it and change the Mac policy provider to watch for changes to the plist file in /Library/Managed Preferences/<username>. BUG=52040 TEST=unit tests Review URL: http://codereview.chromium.org/4062002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64415 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bookmark manager on mac and windows.tony@chromium.org2010-06-241-5/+0
| | | | | | | | | | | | | | | Mac was failing because the resources directory was in a different place. Win was failing because path separators between two filepaths are different causing the equality check to fail. TBR=erg Review URL: http://codereview.chromium.org/2873017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50706 0039d316-1c4b-4281-b951-d872f2087c98
* Enable policy support on the Linux platform.danno@chromium.org2010-06-231-0/+12
| | | | | | | | | | | | | | | | | | | | | On the Linux platform policies are read from a configuration file directory. Depending whether the chromium build is branded or not the configuration file directory is: /etc/opt/chromium or /etc/opt/chrome The configuration file directory will contain two sub-subdirectories: policies/managed policies/recommended The sub-directory policies/managed will contain all managed policies that are enforced on the user. The sub-directory policies/recommended will contain policies for recommended setting that can be changed by a user. BUG=47278 TEST=manual Review URL: http://codereview.chromium.org/2854005 Patch from Markus Heintz <markusheintz@google.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50589 0039d316-1c4b-4281-b951-d872f2087c98
* Speculative fix for installed windows build.tony@chromium.org2010-06-221-1/+1
| | | | | | | | TBR=erg Review URL: http://codereview.chromium.org/2827019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50436 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals resources from resources.pak.tony@chromium.org2010-06-221-5/+10
| | | | | | | | | | | | | | | This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50433 0039d316-1c4b-4281-b951-d872f2087c98
* Speculatively revert 50374 (miniinstaller breakage) - Load netinternals ↵willchan@chromium.org2010-06-211-10/+5
| | | | | | | | | | | | | | | | | | | | resources from resources.pak. This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2799022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50392 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals resources from resources.pak.erg@chromium.org2010-06-211-5/+10
| | | | | | | | | | | | | | | This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50374 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 50257 - Reland r50057. This is exactly the same except with two lines ↵erg@chromium.org2010-06-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | cherrypicked from tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2811016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50260 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r50057. This is exactly the same except with two lines cherrypicked fromerg@chromium.org2010-06-181-5/+0
| | | | | | | | | | | | | | | | | | | tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50257 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 50057 - Load net-internals from the newly created resources.pak file.erg@chromium.org2010-06-171-0/+5
| | | | | | | | | | | | | | This patch also forces the loading of the optional DataPack for const correctness reasons BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2855003 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2852011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50059 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals from the newly created resources.pak file.erg@chromium.org2010-06-171-5/+0
| | | | | | | | | | | This patch also forces the loading of the optional DataPack for const correctness reasons BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2855003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50057 0039d316-1c4b-4281-b951-d872f2087c98
* Don't check if the internal plugin exists when someone just asks for its ↵jam@chromium.org2010-06-161-2/+0
| | | | | | | | path, as that'll fail in the sandbox and we don't care about the result then. Review URL: http://codereview.chromium.org/2799009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49896 0039d316-1c4b-4281-b951-d872f2087c98
* Load resources.pak, which should be located next to the chrometony@chromium.org2010-06-151-0/+5
| | | | | | | | | | | | | | | binary. resources.pak will contain all the files we currently have in the resources subdirectory (it currently only has net-internals files). On Linux, this is an eager load (before the zygote), but on Mac and Win, this is lazily loaded as needed. This isn't being used yet, just adding the necessary plumbing for now. BUG=42770 Review URL: http://codereview.chromium.org/2755006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49772 0039d316-1c4b-4281-b951-d872f2087c98
* On Mac, move internal plugins to live inside the framework ...viettrungluu@chromium.org2010-06-141-3/+5
| | | | | | | | | | | ... in particular in a subdirectory called "Internet Plug-Ins". BUG=none TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory Review URL: http://codereview.chromium.org/2805005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49742 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 49738 [problems running tests] - On Mac, move internal plugins to ↵viettrungluu@chromium.org2010-06-141-8/+10
| | | | | | | | | | | | | | | | live inside the framework ... ... in particular in a subdirectory called "Internet Plug-Ins". BUG=46400 TEST=builds okay everywhere (including branded builds); internal Flash still okay everywhere on branded builds; on Mac, Flash files end up in above-indicated directory Review URL: http://codereview.chromium.org/2823003 TBR=viettrungluu@chromium.org Review URL: http://codereview.chromium.org/2857001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49740 0039d316-1c4b-4281-b951-d872f2087c98