diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 18:03:31 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 18:03:31 +0000 |
commit | a23f3031457f6518580a976204c099bb43069dd2 (patch) | |
tree | d87d6f6a3865121c50f19bc1bcc1799c7ce91efa /chrome/common | |
parent | 5d15ae918f5b07bb5203ee001cdefd9058ddac86 (diff) | |
download | chromium_src-a23f3031457f6518580a976204c099bb43069dd2.zip chromium_src-a23f3031457f6518580a976204c099bb43069dd2.tar.gz chromium_src-a23f3031457f6518580a976204c099bb43069dd2.tar.bz2 |
Trim the dependencies of the plugin_dll and renderer_dll projects. Browser_dll will follow. At this point, plugin.dll and renderer.dll are roughly 35% smaller than browser.dll and chrome.dll
BUG=1211534
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/common.vcproj | 38 | ||||
-rw-r--r-- | chrome/common/common_glue.cc | 67 |
2 files changed, 88 insertions, 17 deletions
diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index 4931cc8..d8f2355 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="8,00" Name="common" ProjectGUID="{899F1280-3441-4D1F-BA04-CCD6208D9146}" RootNamespace="common" @@ -394,6 +394,10 @@ > </File> <File + RelativePath=".\common_glue.cc" + > + </File> + <File RelativePath=".\common_resources.h" > </File> @@ -530,22 +534,6 @@ > </File> <File - RelativePath=".\slide_animation.cc" - > - </File> - <File - RelativePath=".\slide_animation.h" - > - </File> - <File - RelativePath=".\throb_animation.cc" - > - </File> - <File - RelativePath=".\throb_animation.h" - > - </File> - <File RelativePath="..\tools\build\win\precompiled.cc" > <FileConfiguration @@ -630,6 +618,14 @@ > </File> <File + RelativePath=".\slide_animation.cc" + > + </File> + <File + RelativePath=".\slide_animation.h" + > + </File> + <File RelativePath=".\sqlite_compiled_statement.cc" > </File> @@ -662,6 +658,14 @@ > </File> <File + RelativePath=".\throb_animation.cc" + > + </File> + <File + RelativePath=".\throb_animation.h" + > + </File> + <File RelativePath=".\thumbnail_score.cc" > </File> diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc new file mode 100644 index 0000000..7db6475 --- /dev/null +++ b/chrome/common/common_glue.cc @@ -0,0 +1,67 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "base/command_line.h" +#include "base/path_service.h" +#include "chrome/common/chrome_paths.h" +#include "chrome/common/chrome_switches.h" +#include "chrome/common/resource_bundle.h" +#include "chrome/plugin/npobject_util.h" +#include "googleurl/src/url_util.h" +#include "webkit/glue/webkit_glue.h" + +namespace webkit_glue { + +bool GetExeDirectory(std::wstring *path) { + return PathService::Get(base::DIR_EXE, path); +} + +bool GetApplicationDirectory(std::wstring *path) { + return PathService::Get(chrome::DIR_APP, path); +} + +bool IsPluginRunningInRendererProcess() { + return !IsPluginProcess(); +} + +std::wstring GetWebKitLocale() { + // The browser process should have passed the locale to the renderer via the + // --lang command line flag. + CommandLine parsed_command_line; + const std::wstring& lang = + parsed_command_line.GetSwitchValue(switches::kLang); + DCHECK(!lang.empty()); + return lang; +} + +std::wstring GetLocalizedString(int message_id) { + return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id); +} + +} // namespace webkit_glue |