diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:03:32 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 20:03:32 +0000 |
| commit | 9d5804f68add5c1ab7bb48be7989d798f0988375 (patch) | |
| tree | 3b31ae298d7d2154337ac6622f8b361abef38f0b /chrome/common/chrome_switches.cc | |
| parent | 044627eb27f28939855307d4f33cf46af33bd185 (diff) | |
| download | chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.zip chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.tar.gz chromium_src-9d5804f68add5c1ab7bb48be7989d798f0988375.tar.bz2 | |
Revert 48424 - Adding initial implementation of the PartnerCustomization classes.
BUG=chromiumos:3176
TEST=Run out/Debug/unit_tests. Run out/Debug/chrome loginmanager startupmanifest=./chrome/browser/chromeos/testdata/startup_manifest.json. There should be no asserts.
Review URL: http://codereview.chromium.org/2101021
TBR=denisromanov@chromium.org
Build error below. I don't immediately see how this CL caused the
problem, but the only other things on the blamelist are valgrind
suppressions which don't change code.
Linking...
LINK : warning LNK4224: /OPT:NOWIN98 is no longer supported; ignored
Creating library C:\b\slave\chromium-rel-builder\build\src\build\Release\lib\npchrome_frame.lib and object C:\b\slave\chromium-rel-builder\build\src\build\Release\lib\npchrome_frame.exp
chrome_tab.obj : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
chrome_frame_ie.lib(chrome_active_document.obj) : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
chrome_frame_npapi.lib(utils.obj) : error LNK2001: unresolved external symbol "unsigned int (__stdcall* ATL::g_pfnGetThreadACP)(void)" (?g_pfnGetThreadACP@ATL@@3P6GIXZA)
C:\b\slave\chromium-rel-builder\build\src\build\Release\servers\npchrome_frame.dll : fatal error LNK1120: 1 unresolved externals
Error executing link.exe (tool returned code: 1120)
2 build system warning(s):
- VS settings folder not found
- Interoperability reenabled
Review URL: http://codereview.chromium.org/2224008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_switches.cc')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 5596e85..4723d5d 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -895,11 +895,6 @@ const char kLoginUser[] = "login-user"; // Use the frame layout used in chromeos. const char kChromeosFrame[] = "chromeos-frame"; - -// Specify startup customization manifest. -// TODO(denisromanov): delete this once it's not needed for testing anymore. -const char kStartupManifest[] = "startup-manifest"; - #endif #if defined(OS_WIN) |