summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chrome_thread.h1
-rw-r--r--chrome/browser/download/download_exe.cc2
-rw-r--r--chrome/browser/icon_loader.h3
-rw-r--r--chrome/browser/net/dns_host_info.h1
-rw-r--r--chrome/browser/net/url_fetcher_protect.cc2
-rw-r--r--chrome/browser/net/url_fetcher_protect.h1
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page.h1
-rw-r--r--chrome/browser/ssl/ssl_error_info.h1
-rwxr-xr-xchrome/browser/ssl/ssl_host_state.cc2
-rw-r--r--chrome/browser/views/hung_renderer_view.h2
-rw-r--r--chrome/browser/views/keyword_editor_view.h1
-rw-r--r--chrome/browser/window_sizer.h2
-rw-r--r--chrome/browser/window_sizer_unittest.cc1
-rw-r--r--chrome/common/chrome_plugin_util.h10
-rw-r--r--chrome/test/testing_browser_process.h1
15 files changed, 17 insertions, 14 deletions
diff --git a/chrome/browser/chrome_thread.h b/chrome/browser/chrome_thread.h
index 305af03..53fa50b 100644
--- a/chrome/browser/chrome_thread.h
+++ b/chrome/browser/chrome_thread.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_CHROME_THREAD_H__
#include "base/lock.h"
-#include "base/logging.h"
#include "base/thread.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/download/download_exe.cc b/chrome/browser/download/download_exe.cc
index 059fab8..994f5f0 100644
--- a/chrome/browser/download/download_exe.cc
+++ b/chrome/browser/download/download_exe.cc
@@ -7,6 +7,8 @@
#include "chrome/browser/download/download_util.h"
+#include "base/logging.h"
+
namespace download_util {
// For file extensions taken from mozilla:
diff --git a/chrome/browser/icon_loader.h b/chrome/browser/icon_loader.h
index 0c59848..3505aae 100644
--- a/chrome/browser/icon_loader.h
+++ b/chrome/browser/icon_loader.h
@@ -5,10 +5,11 @@
#ifndef CHROME_BROWSER_ICON_LOADER_H__
#define CHROME_BROWSER_ICON_LOADER_H__
-#include "base/logging.h"
#include <string>
#include <windows.h>
+#include "base/basictypes.h"
+
namespace {
class IconLoaderProcessor;
}
diff --git a/chrome/browser/net/dns_host_info.h b/chrome/browser/net/dns_host_info.h
index b9ea157..64681056 100644
--- a/chrome/browser/net/dns_host_info.h
+++ b/chrome/browser/net/dns_host_info.h
@@ -13,7 +13,6 @@
#include <string>
#include <vector>
-#include "base/logging.h"
#include "base/time.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/net/url_fetcher_protect.cc b/chrome/browser/net/url_fetcher_protect.cc
index 5b7b208..22292ab 100644
--- a/chrome/browser/net/url_fetcher_protect.cc
+++ b/chrome/browser/net/url_fetcher_protect.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/net/url_fetcher_protect.h"
+#include "base/logging.h"
+
// URLFetcherProtectEntry ----------------------------------------------------
using base::TimeDelta;
diff --git a/chrome/browser/net/url_fetcher_protect.h b/chrome/browser/net/url_fetcher_protect.h
index 794418b..7352932 100644
--- a/chrome/browser/net/url_fetcher_protect.h
+++ b/chrome/browser/net/url_fetcher_protect.h
@@ -13,7 +13,6 @@
#include <string>
#include "base/lock.h"
-#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
index 8e3d1fd..242f68f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
@@ -31,7 +31,6 @@
#include <map>
#include <vector>
-#include "base/logging.h"
#include "chrome/browser/tab_contents/interstitial_page.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h
index 93f60df..d11fc0d 100644
--- a/chrome/browser/ssl/ssl_error_info.h
+++ b/chrome/browser/ssl/ssl_error_info.h
@@ -8,7 +8,6 @@
#include <string>
#include <vector>
-#include "base/logging.h"
#include "net/base/x509_certificate.h"
class GURL;
diff --git a/chrome/browser/ssl/ssl_host_state.cc b/chrome/browser/ssl/ssl_host_state.cc
index 5bee7d9..1fdf200 100755
--- a/chrome/browser/ssl/ssl_host_state.cc
+++ b/chrome/browser/ssl/ssl_host_state.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ssl/ssl_host_state.h"
+#include "base/logging.h"
+
SSLHostState::SSLHostState() {
}
diff --git a/chrome/browser/views/hung_renderer_view.h b/chrome/browser/views/hung_renderer_view.h
index bf60962..0b26e90 100644
--- a/chrome/browser/views/hung_renderer_view.h
+++ b/chrome/browser/views/hung_renderer_view.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_VIEWS_HUNG_RENDERER_VIEW_H__
#define CHROME_BROWSER_VIEWS_HUNG_RENDERER_VIEW_H__
-#include "base/logging.h"
+#include "base/basictypes.h"
class HungRendererWarningView;
namespace views {
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index 8d475e7..a576430 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -8,7 +8,6 @@
#include <Windows.h>
#include <map>
-#include "base/logging.h"
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/views/dialog_delegate.h"
#include "chrome/views/native_button.h"
diff --git a/chrome/browser/window_sizer.h b/chrome/browser/window_sizer.h
index abc5115..d7d1c24 100644
--- a/chrome/browser/window_sizer.h
+++ b/chrome/browser/window_sizer.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_WINDOW_SIZER_H__
#define CHROME_BROWSER_WINDOW_SIZER_H__
+#include "base/basictypes.h"
#include "base/gfx/rect.h"
-#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/window_sizer_unittest.cc b/chrome/browser/window_sizer_unittest.cc
index 3769d63..d49ea89 100644
--- a/chrome/browser/window_sizer_unittest.cc
+++ b/chrome/browser/window_sizer_unittest.cc
@@ -5,6 +5,7 @@
#include <vector>
#include "chrome/browser/window_sizer.h"
+#include "base/logging.h"
#include "testing/gtest/include/gtest/gtest.h"
// Some standard monitor sizes (no task bar).
diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h
index b7d7b96..d587ef1 100644
--- a/chrome/common/chrome_plugin_util.h
+++ b/chrome/common/chrome_plugin_util.h
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_COMMON_CHROME_PLUGIN_UTIL_H__
-#define CHROME_COMMON_CHROME_PLUGIN_UTIL_H__
+#ifndef CHROME_COMMON_CHROME_PLUGIN_UTIL_H_
+#define CHROME_COMMON_CHROME_PLUGIN_UTIL_H_
+
+#include <string>
#include "base/basictypes.h"
#include "base/non_thread_safe.h"
@@ -51,7 +53,7 @@ class PluginHelper : public NotificationObserver, public NonThreadSafe {
protected:
scoped_refptr<ChromePluginLib> plugin_;
- DISALLOW_EVIL_CONSTRUCTORS(PluginHelper);
+ DISALLOW_COPY_AND_ASSIGN(PluginHelper);
};
// A class of utility functions for dealing with request responses.
@@ -80,4 +82,4 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
void* STDCALL CPB_Alloc(uint32 size);
void STDCALL CPB_Free(void* memory);
-#endif // CHROME_COMMON_CHROME_PLUGIN_UTIL_H__
+#endif // CHROME_COMMON_CHROME_PLUGIN_UTIL_H_
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 922fa82..0cbe91b 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -18,7 +18,6 @@
#include "base/waitable_event.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/notification_service.h"
-#include "base/logging.h"
class TestingBrowserProcess : public BrowserProcess {
public:
generated by cgit v1.1 at 2025-01-21 01:32:49 +0000