summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 20:55:11 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 20:55:11 +0000
commitffe88f7578d07e1924d88abc9e4b6e3d112e6345 (patch)
tree123976c73b7f49ba66efd8e394c1797bbdef115c /chrome
parentdb5e2d909a38d03b013a3b581e394091079b57d4 (diff)
downloadchromium_src-ffe88f7578d07e1924d88abc9e4b6e3d112e6345.zip
chromium_src-ffe88f7578d07e1924d88abc9e4b6e3d112e6345.tar.gz
chromium_src-ffe88f7578d07e1924d88abc9e4b6e3d112e6345.tar.bz2
Delete all precompiled support. It is causing more harm than good, especially when define changes.
TEST=none BUG=20889 Review URL: http://codereview.chromium.org/171118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/about_ipc_dialog.cc2
-rw-r--r--chrome/browser/views/about_ipc_dialog.h10
-rw-r--r--chrome/chrome.gyp112
-rw-r--r--chrome/tools/build/win/precompiled.cc2
-rw-r--r--chrome/tools/build/win/precompiled.h40
-rw-r--r--chrome/tools/build/win/precompiled.vsprops15
-rw-r--r--chrome/tools/build/win/precompiled_wtl.cc2
-rw-r--r--chrome/tools/build/win/precompiled_wtl.h19
-rw-r--r--chrome/tools/build/win/precompiled_wtl.vsprops15
9 files changed, 9 insertions, 208 deletions
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 89325ca..ea3c1c9 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -362,7 +362,7 @@ void AboutIPCDialog::Layout() {
if (!message_list_.m_hWnd) {
HWND parent_window = GetRootView()->GetWidget()->GetNativeView();
- CRect rect(0, 0, 10, 10);
+ RECT rect = {0, 0, 10, 10};
HWND list_hwnd = message_list_.Create(parent_window,
rect, NULL, WS_CHILD | WS_VISIBLE | LVS_SORTASCENDING);
message_list_.SetViewType(LVS_REPORT);
diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h
index 2f4eaf5..c0826b6 100644
--- a/chrome/browser/views/about_ipc_dialog.h
+++ b/chrome/browser/views/about_ipc_dialog.h
@@ -5,13 +5,19 @@
#ifndef CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
#define CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
+#if defined(OS_WIN) && defined(IPC_MESSAGE_LOG_ENABLED)
+
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlwin.h>
+#include <atlctrls.h>
+
#include "base/singleton.h"
#include "ipc/ipc_logging.h"
#include "views/controls/button/button.h"
#include "views/controls/table/table_view.h"
#include "views/window/dialog_delegate.h"
-#if defined(OS_WIN) && defined(IPC_MESSAGE_LOG_ENABLED)
class Profile;
namespace views {
@@ -54,7 +60,7 @@ class AboutIPCDialog : public views::DialogDelegate,
// views::ButtonListener.
virtual void ButtonPressed(views::Button* button, const views::Event& event);
- CListViewCtrl message_list_;
+ WTL::CListViewCtrl message_list_;
views::TextButton* track_toggle_;
views::TextButton* clear_button_;
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index f12a88c..95c587c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -611,9 +611,6 @@
'common/zip.cc', # Requires zlib directly.
'common/zip.h',
'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
-
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -623,12 +620,6 @@
'export_dependent_settings': [
'../app/app.gyp:app_base',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
- },
- },
'conditions': [
['OS=="linux"', {
'dependencies': [
@@ -2160,8 +2151,6 @@
'browser/worker_host/worker_service.h',
'browser/zygote_host_linux.cc',
'browser/zygote_main_linux.cc',
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
# This file is generated by GRIT.
'<(grit_out_dir)/grit/theme_resources_map.cc',
@@ -2382,12 +2371,6 @@
'browser/views/tabs/tab_overview_types.cc',
'browser/views/tabs/tab_overview_types.h',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
- },
- },
}, { # 'OS!="win"
'sources/': [
# Exclude all of hang_monitor.
@@ -2745,16 +2728,7 @@
'plugin/webplugin_delegate_stub.h',
'plugin/webplugin_proxy.cc',
'plugin/webplugin_proxy.h',
-
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
- },
- },
# These are layered in conditionals in the event other platforms
# end up using this module as well.
'conditions': [
@@ -2881,21 +2855,12 @@
'renderer/webplugin_delegate_proxy.h',
'renderer/webworker_proxy.cc',
'renderer/webworker_proxy.h',
-
- 'tools/build/win/precompiled_wtl.cc',
- 'tools/build/win/precompiled_wtl.h',
],
'link_settings': {
'mac_bundle_resources': [
'renderer/renderer.sb',
],
},
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
- },
- },
'conditions': [
# Linux-specific rules.
['OS=="linux"', {
@@ -2920,9 +2885,6 @@
'../skia/skia.gyp:skia',
],
'sources': [
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
-
'utility/utility_main.cc',
'utility/utility_thread.cc',
'utility/utility_thread.h',
@@ -2930,12 +2892,6 @@
'include_dirs': [
'..',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
- },
- },
'conditions': [
['OS=="linux"', {
'dependencies': [
@@ -2953,8 +2909,6 @@
'../webkit/webkit.gyp:webkit',
],
'sources': [
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
'worker/nativewebworker_impl.cc',
'worker/nativewebworker_impl.h',
'worker/nativewebworker_stub.cc',
@@ -2970,12 +2924,6 @@
'include_dirs': [
'..',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled.cc',
- },
- },
},
{
'target_name': 'chrome',
@@ -3738,21 +3686,12 @@
'sources': [
'test/automated_ui_tests/automated_ui_tests.cc',
'test/automated_ui_tests/automated_ui_tests.h',
-
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
],
'conditions': [
['OS=="win"', {
'include_dirs': [
'third_party/wtl/include',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
- },
- },
}],
],
},
@@ -3823,9 +3762,6 @@
'test/ui/sunspider_uitest.cc',
'test/ui/v8_benchmark_uitest.cc',
'worker/worker_uitest.cc',
-
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
],
'conditions': [
['OS=="linux"', {
@@ -3882,8 +3818,6 @@
},
'configurations': {
'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -4222,9 +4156,6 @@
'test/v8_unit_test.cc',
'test/v8_unit_test.h',
'../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
-
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
],
'conditions': [
['chromeos==0', {
@@ -4349,8 +4280,6 @@
},
'configurations': {
'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -4409,8 +4338,6 @@
'sources': [
'test/startup/feature_startup_test.cc',
'test/startup/startup_test.cc',
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
],
'conditions': [
['OS=="linux"', {
@@ -4525,8 +4452,6 @@
],
'sources': [
'test/page_cycler/page_cycler_test.cc',
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
],
'conditions': [
['OS=="linux"', {
@@ -4620,16 +4545,6 @@
'include_dirs': [
'third_party/wtl/include',
],
- 'sources': [
- 'tools/build/win/precompiled_wtl.cc',
- 'tools/build/win/precompiled_wtl.h',
- ],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
- },
- },
}], # OS="win"
], # conditions
},
@@ -5304,14 +5219,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
-
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
],
'configurations': {
'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -5583,8 +5493,6 @@
# TODO(phajdan.jr): Only temporary, to make transition easier.
'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
'sources': [
- 'tools/build/win/precompiled_wtl.cc',
- 'tools/build/win/precompiled_wtl.h',
'test/live_sync/bookmark_model_verifier.cc',
'test/live_sync/bookmark_model_verifier.h',
'test/live_sync/live_bookmarks_sync_test.cc',
@@ -5664,8 +5572,6 @@
],
'configurations': {
'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
'msvs_settings': {
'VCLinkerTool': {
'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -5683,8 +5589,6 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_dll_version.rc.version',
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
@@ -5784,15 +5688,7 @@
],
'sources': [
'test/plugin/plugin_test.cpp',
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
- },
- },
},
{
'target_name': 'reliability_tests',
@@ -5849,15 +5745,7 @@
],
'sources': [
'test/selenium/selenium_test.cc',
- 'tools/build/win/precompiled_wtl.h',
- 'tools/build/win/precompiled_wtl.cc',
],
- 'configurations': {
- 'Debug': {
- 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
- 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
- },
- },
},
{
'target_name': 'test_chrome_plugin',
diff --git a/chrome/tools/build/win/precompiled.cc b/chrome/tools/build/win/precompiled.cc
deleted file mode 100644
index b09ed13..0000000
--- a/chrome/tools/build/win/precompiled.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-// This file exists purely as a means to generate precompiled.pch
-#include "precompiled.h"
diff --git a/chrome/tools/build/win/precompiled.h b/chrome/tools/build/win/precompiled.h
deleted file mode 100644
index 4b8e79b..0000000
--- a/chrome/tools/build/win/precompiled.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-//
-// This header file is pre-compiled and added to the cl.exe command line for
-// each source file. You should not include it explicitly. Instead, you
-// should ensure that your source files specify all of their include files
-// explicitly so they may be used without this pre-compiled header.
-//
-// To make use of this header file in a vcproj, just add precompiled.cc as a
-// build target, and modify its build properties to enable /Yc for that file
-// only. Then add the precompiled.vsprops property sheet to your vcproj.
-//
-
-// windows headers
-// TODO: when used, winsock2.h must be included before windows.h or
-// the build blows up. The best fix is to define WIN32_LEAN_AND_MEAN.
-// The best workaround is to define _WINSOCKAPI_. That's what winsock2.h does.
-#include <winsock2.h>
-#include <windows.h>
-#include <shellapi.h>
-#include <shlobj.h>
-#include <tchar.h>
-
-// runtime headers
-#include <cassert>
-#include <climits>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <memory.h>
-
-// Usual STL
-#include <algorithm>
-#include <list>
-#include <map>
-#include <string>
-#include <strstream>
-#include <vector>
diff --git a/chrome/tools/build/win/precompiled.vsprops b/chrome/tools/build/win/precompiled.vsprops
deleted file mode 100644
index 464ea32..0000000
--- a/chrome/tools/build/win/precompiled.vsprops
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="precompiled"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;$(SolutionDir)tools\build\win&quot;"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="precompiled.h"
- PrecompiledHeaderFile="$(IntDir)\precompiled.pch"
- ForcedIncludeFiles="precompiled.h"
- />
-</VisualStudioPropertySheet>
diff --git a/chrome/tools/build/win/precompiled_wtl.cc b/chrome/tools/build/win/precompiled_wtl.cc
deleted file mode 100644
index 0f6272d..0000000
--- a/chrome/tools/build/win/precompiled_wtl.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-// This file exists purely as a means to generate precompiled.pch
-#include "precompiled_wtl.h"
diff --git a/chrome/tools/build/win/precompiled_wtl.h b/chrome/tools/build/win/precompiled_wtl.h
deleted file mode 100644
index 55a5664..0000000
--- a/chrome/tools/build/win/precompiled_wtl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// See precompiled.h for info on using this file, substituting references to
-// "precompiled" with "precompiled_wtl"
-
-#include "chrome/tools/build/win/precompiled.h"
-
-// ATL/WTL headers
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlwin.h>
-#include <atldlgs.h>
-#include <atlframe.h>
-#include <atlmisc.h>
-#include <atlctrls.h>
-#include <atlcrack.h>
-#include <atltheme.h>
diff --git a/chrome/tools/build/win/precompiled_wtl.vsprops b/chrome/tools/build/win/precompiled_wtl.vsprops
deleted file mode 100644
index 1e9a915..0000000
--- a/chrome/tools/build/win/precompiled_wtl.vsprops
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="precompiled_wtl"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;$(SolutionDir)tools\build\win&quot;"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="precompiled_wtl.h"
- PrecompiledHeaderFile="$(IntDir)\precompiled_wtl.pch"
- ForcedIncludeFiles="precompiled_wtl.h"
- />
-</VisualStudioPropertySheet>