summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/browser.dll.deps2
-rw-r--r--chrome/app/plugin.dll.deps12
-rw-r--r--chrome/app/renderer.dll.deps12
-rw-r--r--chrome/browser/render_process_host.cc1
-rw-r--r--chrome/chrome.sln7
-rw-r--r--chrome/common/common.vcproj38
-rw-r--r--chrome/common/common_glue.cc67
-rw-r--r--chrome/renderer/render_process.cc4
-rw-r--r--chrome/renderer/renderer_glue.cc39
9 files changed, 91 insertions, 91 deletions
diff --git a/chrome/app/browser.dll.deps b/chrome/app/browser.dll.deps
index dc74e05..608fc1e 100644
--- a/chrome/app/browser.dll.deps
+++ b/chrome/app/browser.dll.deps
@@ -1,4 +1,4 @@
-# List of chrome.dll's dependencies.
+# List of browser.dll's dependencies.
dependents = [
'KERNEL32.dll',
diff --git a/chrome/app/plugin.dll.deps b/chrome/app/plugin.dll.deps
index dc74e05..d52c3bd 100644
--- a/chrome/app/plugin.dll.deps
+++ b/chrome/app/plugin.dll.deps
@@ -1,4 +1,4 @@
-# List of chrome.dll's dependencies.
+# List of plugin.dll's dependencies.
dependents = [
'KERNEL32.dll',
@@ -6,27 +6,17 @@ dependents = [
'ADVAPI32.dll',
'MSIMG32.dll',
'WINMM.dll',
- 'COMCTL32.dll',
'SHLWAPI.dll',
- 'RPCRT4.dll',
'GDI32.dll',
'SHELL32.dll',
'VERSION.dll',
'USP10.dll',
'ole32.dll',
'OLEAUT32.dll',
- 'OLEACC.dll',
]
delay_loaded = [
- 'CRYPTUI.dll',
- 'IMM32.dll',
- 'CRYPT32.dll',
'WINHTTP.dll',
- 'WININET.dll',
'WS2_32.dll',
- 'PSAPI.DLL',
- 'dwmapi.dll',
- 'COMDLG32.dll',
'urlmon.dll',
]
diff --git a/chrome/app/renderer.dll.deps b/chrome/app/renderer.dll.deps
index dc74e05..d7531a0 100644
--- a/chrome/app/renderer.dll.deps
+++ b/chrome/app/renderer.dll.deps
@@ -1,4 +1,4 @@
-# List of chrome.dll's dependencies.
+# List of renderer.dll's dependencies.
dependents = [
'KERNEL32.dll',
@@ -6,27 +6,17 @@ dependents = [
'ADVAPI32.dll',
'MSIMG32.dll',
'WINMM.dll',
- 'COMCTL32.dll',
'SHLWAPI.dll',
- 'RPCRT4.dll',
'GDI32.dll',
'SHELL32.dll',
'VERSION.dll',
'USP10.dll',
'ole32.dll',
'OLEAUT32.dll',
- 'OLEACC.dll',
]
delay_loaded = [
- 'CRYPTUI.dll',
- 'IMM32.dll',
- 'CRYPT32.dll',
'WINHTTP.dll',
- 'WININET.dll',
'WS2_32.dll',
- 'PSAPI.DLL',
- 'dwmapi.dll',
- 'COMDLG32.dll',
'urlmon.dll',
]
diff --git a/chrome/browser/render_process_host.cc b/chrome/browser/render_process_host.cc
index c1f2b5f..43ebb64 100644
--- a/chrome/browser/render_process_host.cc
+++ b/chrome/browser/render_process_host.cc
@@ -276,7 +276,6 @@ bool RenderProcessHost::Init() {
switches::kDumpHistogramsOnExit,
switches::kDisableLogging,
switches::kDebugPrint,
- switches::kDnsPrefetchDisable,
switches::kAllowAllActiveX,
switches::kMemoryProfiling,
switches::kEnableWatchdog,
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index e7b5304..fe1b119 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -1114,7 +1114,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer_dll", "app\rendere
{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
{57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
- {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
{62329A0E-FCC2-47F0-AEEB-3DE8A88E4BEC} = {62329A0E-FCC2-47F0-AEEB-3DE8A88E4BEC}
{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
{64D1EA28-E2E6-417F-8962-9AA3DE64AAD1} = {64D1EA28-E2E6-417F-8962-9AA3DE64AAD1}
@@ -1146,20 +1145,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_dll", "app\plugin_dl
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {20A560A0-2CD0-4D9E-A58B-1F24B99C087A}
{238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601}
- {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE}
{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934}
{5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700}
- {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6}
{5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6}
- {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
{62329A0E-FCC2-47F0-AEEB-3DE8A88E4BEC} = {62329A0E-FCC2-47F0-AEEB-3DE8A88E4BEC}
{625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0}
{64D1EA28-E2E6-417F-8962-9AA3DE64AAD1} = {64D1EA28-E2E6-417F-8962-9AA3DE64AAD1}
{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}
{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
- {8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
{9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {9301A569-5D2B-4D11-9332-B1E30AEACB8D}
{9C73A535-5B05-440F-8F33-D867164E75EF} = {9C73A535-5B05-440F-8F33-D867164E75EF}
{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551}
@@ -1167,9 +1162,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_dll", "app\plugin_dl
{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
- {D703D7A0-EDC1-4FE6-9E22-56154155B24E} = {D703D7A0-EDC1-4FE6-9E22-56154155B24E}
{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C}
- {EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC}
{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
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
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index 5d15ba4..2817b90 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -103,10 +103,6 @@ bool RenderProcess::GlobalInit(const std::wstring &channel_name) {
command_line.HasSwitch(switches::kSingleProcess))
load_plugins_in_process_ = true;
- if (command_line.HasSwitch(switches::kDnsPrefetchDisable)) {
- chrome_browser_net::EnableDnsPrefetch(false);
- }
-
if (command_line.HasSwitch(switches::kEnableWatchdog)) {
// TODO(JAR): Need to implement renderer IO msgloop watchdog.
}
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 5d9c9d4..7be4c7b 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -32,27 +32,14 @@
#include <windows.h>
#include <wininet.h>
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
#include "chrome/renderer/net/render_dns_master.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/render_messages.h"
#include "chrome/common/resource_bundle.h"
-#include "chrome/common/resource_dispatcher.h"
#include "chrome/plugin/npobject_util.h"
-#include "chrome/renderer/render_process.h"
-#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/visitedlink_slave.h"
-#include "googleurl/src/gurl.h"
#include "googleurl/src/url_util.h"
#include "net/base/mime_util.h"
-#include "webkit/glue/resource_type.h"
#include "webkit/glue/webframe.h"
-#include "webkit/glue/webview.h"
#include "webkit/glue/webkit_glue.h"
#include "SkBitmap.h"
@@ -202,10 +189,6 @@ IMLangFontLink2* webkit_glue::GetLangFontLink() {
return RenderProcess::GetLangFontLink();
}
-std::wstring webkit_glue::GetLocalizedString(int message_id) {
- return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
-}
-
std::string webkit_glue::GetDataResource(int resource_id) {
return ResourceBundle::GetSharedInstance().GetDataResource(resource_id);
}
@@ -289,11 +272,6 @@ void webkit_glue::ClipboardReadHTML(std::wstring* markup, GURL* url) {
RenderThread::current()->Send(new ViewHostMsg_ClipboardReadHTML(markup, url));
}
-
-bool webkit_glue::GetApplicationDirectory(std::wstring *path) {
- return PathService::Get(chrome::DIR_APP, path);
-}
-
GURL webkit_glue::GetInspectorURL() {
return GURL("chrome-resource://inspector/inspector.html");
}
@@ -302,20 +280,12 @@ std::string webkit_glue::GetUIResourceProtocol() {
return "chrome-resource";
}
-bool webkit_glue::GetExeDirectory(std::wstring *path) {
- return PathService::Get(base::DIR_EXE, path);
-}
-
bool webkit_glue::GetPlugins(bool refresh,
std::vector<WebPluginInfo>* plugins) {
return RenderThread::current()->Send(
new ViewHostMsg_GetPlugins(refresh, plugins));
}
-bool webkit_glue::IsPluginRunningInRendererProcess() {
- return !IsPluginProcess();
-}
-
bool webkit_glue::EnsureFontLoaded(HFONT font) {
LOGFONT logfont;
GetObject(font, sizeof(LOGFONT), &logfont);
@@ -329,15 +299,6 @@ MONITORINFOEX webkit_glue::GetMonitorInfoForWindow(HWND window) {
return monitor_info;
}
-std::wstring webkit_glue::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;
-}
#ifndef USING_SIMPLE_RESOURCE_LOADER_BRIDGE
generated by cgit v1.1 at 2025-02-01 10:01:32 +0000