summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chrome_content_browser_client.h34
-rw-r--r--chrome/common/chrome_content_plugin_client.h3
-rw-r--r--chrome/renderer/chrome_content_renderer_client.h41
-rw-r--r--content/browser/site_instance_unittest.cc5
4 files changed, 44 insertions, 39 deletions
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 33bcb65..e8b978f 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
#pragma once
+#include "base/compiler_specific.h"
#include "content/browser/content_browser_client.h"
class QuotaPermissionContext;
@@ -14,38 +15,39 @@ namespace chrome {
class ChromeContentBrowserClient : public content::ContentBrowserClient {
public:
- virtual void RenderViewHostCreated(RenderViewHost* render_view_host);
- virtual void BrowserRenderProcessHostCreated(BrowserRenderProcessHost* host);
- virtual void PluginProcessHostCreated(PluginProcessHost* host);
- virtual void WorkerProcessHostCreated(WorkerProcessHost* host);
- virtual content::WebUIFactory* GetWebUIFactory();
- virtual GURL GetEffectiveURL(Profile* profile, const GURL& url);
- virtual bool IsURLSameAsAnySiteInstance(const GURL& url);
+ virtual void RenderViewHostCreated(RenderViewHost* render_view_host) OVERRIDE;
+ virtual void BrowserRenderProcessHostCreated(
+ BrowserRenderProcessHost* host) OVERRIDE;
+ virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE;
+ virtual void WorkerProcessHostCreated(WorkerProcessHost* host) OVERRIDE;
+ virtual content::WebUIFactory* GetWebUIFactory() OVERRIDE;
+ virtual GURL GetEffectiveURL(Profile* profile, const GURL& url) OVERRIDE;
+ virtual bool IsURLSameAsAnySiteInstance(const GURL& url) OVERRIDE;
virtual std::string GetCanonicalEncodingNameByAliasName(
- const std::string& alias_name);
+ const std::string& alias_name) OVERRIDE;
virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
- int child_process_id);
- virtual std::string GetApplicationLocale();
- virtual std::string GetAcceptLangs(const TabContents* tab);
+ int child_process_id) OVERRIDE;
+ virtual std::string GetApplicationLocale() OVERRIDE;
+ virtual std::string GetAcceptLangs(const TabContents* tab) OVERRIDE;
virtual bool AllowAppCache(const GURL& manifest_url,
- const content::ResourceContext& context);
+ const content::ResourceContext& context) OVERRIDE;
virtual bool AllowGetCookie(const GURL& url,
const GURL& first_party,
const net::CookieList& cookie_list,
const content::ResourceContext& context,
int render_process_id,
- int render_view_id);
+ int render_view_id) OVERRIDE;
virtual bool AllowSetCookie(const GURL& url,
const GURL& first_party,
const std::string& cookie_line,
const content::ResourceContext& context,
int render_process_id,
int render_view_id,
- net::CookieOptions* options);
- virtual QuotaPermissionContext* CreateQuotaPermissionContext();
+ net::CookieOptions* options) OVERRIDE;
+ virtual QuotaPermissionContext* CreateQuotaPermissionContext() OVERRIDE;
#if defined(OS_POSIX) && !defined(OS_MACOSX)
// Can return an optional fd for crash handling, otherwise returns -1.
- virtual int GetCrashSignalFD(const std::string& process_type);
+ virtual int GetCrashSignalFD(const std::string& process_type) OVERRIDE;
#endif
};
diff --git a/chrome/common/chrome_content_plugin_client.h b/chrome/common/chrome_content_plugin_client.h
index 6b6554b..40e6df3 100644
--- a/chrome/common/chrome_content_plugin_client.h
+++ b/chrome/common/chrome_content_plugin_client.h
@@ -6,13 +6,14 @@
#define CHROME_COMMON_CHROME_CONTENT_PLUGIN_CLIENT_H_
#pragma once
+#include "base/compiler_specific.h"
#include "content/plugin/content_plugin_client.h"
namespace chrome {
class ChromeContentPluginClient : public content::ContentPluginClient {
public:
- virtual void PluginProcessStarted(const string16& plugin_name);
+ virtual void PluginProcessStarted(const string16& plugin_name) OVERRIDE;
};
} // namespace chrome
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index 26e4ccb..5d245f8 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -6,6 +6,7 @@
#define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
#pragma once
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "content/renderer/content_renderer_client.h"
@@ -33,39 +34,39 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
ChromeContentRendererClient();
~ChromeContentRendererClient();
- virtual void RenderThreadStarted();
- virtual void RenderViewCreated(RenderView* render_view);
- virtual void SetNumberOfViews(int number_of_views);
- virtual SkBitmap* GetSadPluginBitmap();
- virtual std::string GetDefaultEncoding();
+ virtual void RenderThreadStarted() OVERRIDE;
+ virtual void RenderViewCreated(RenderView* render_view) OVERRIDE;
+ virtual void SetNumberOfViews(int number_of_views) OVERRIDE;
+ virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
+ virtual std::string GetDefaultEncoding() OVERRIDE;
virtual WebKit::WebPlugin* CreatePlugin(
RenderView* render_view,
WebKit::WebFrame* frame,
- const WebKit::WebPluginParams& params);
+ const WebKit::WebPluginParams& params) OVERRIDE;
virtual void ShowErrorPage(RenderView* render_view,
WebKit::WebFrame* frame,
- int http_status_code);
+ int http_status_code) OVERRIDE;
virtual std::string GetNavigationErrorHtml(
const WebKit::WebURLRequest& failed_request,
- const WebKit::WebURLError& error);
- virtual bool RunIdleHandlerWhenWidgetsHidden();
- virtual bool AllowPopup(const GURL& creator);
+ const WebKit::WebURLError& error) OVERRIDE;
+ virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
+ virtual bool AllowPopup(const GURL& creator) OVERRIDE;
virtual bool ShouldFork(WebKit::WebFrame* frame,
const GURL& url,
bool is_content_initiated,
- bool* send_referrer);
+ bool* send_referrer) OVERRIDE;
virtual bool WillSendRequest(WebKit::WebFrame* frame,
const GURL& url,
- GURL* new_url);
- virtual FilePath GetMediaLibraryPath();
- virtual bool ShouldPumpEventsDuringCookieMessage();
- virtual void DidCreateScriptContext(WebKit::WebFrame* frame);
- virtual void DidDestroyScriptContext(WebKit::WebFrame* frame);
- virtual void DidCreateIsolatedScriptContext(WebKit::WebFrame* frame);
+ GURL* new_url) OVERRIDE;
+ virtual FilePath GetMediaLibraryPath() OVERRIDE;
+ virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE;
+ virtual void DidCreateScriptContext(WebKit::WebFrame* frame) OVERRIDE;
+ virtual void DidDestroyScriptContext(WebKit::WebFrame* frame) OVERRIDE;
+ virtual void DidCreateIsolatedScriptContext(WebKit::WebFrame* frame) OVERRIDE;
virtual unsigned long long VisitedLinkHash(const char* canonical_url,
- size_t length);
- virtual bool IsLinkVisited(unsigned long long link_hash);
- virtual void PrefetchHostName(const char* hostname, size_t length);
+ size_t length) OVERRIDE;
+ virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE;
+ virtual void PrefetchHostName(const char* hostname, size_t length) OVERRIDE;
// For testing.
void SetExtensionDispatcher(ExtensionDispatcher* extension_dispatcher);
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index 63533db..8bda89e 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/compiler_specific.h"
#include "base/stl_util-inl.h"
#include "base/string16.h"
#include "chrome/common/chrome_constants.h"
@@ -41,11 +42,11 @@ class SiteInstanceTestWebUIFactory : public content::EmptyWebUIFactory {
class SiteInstanceTestBrowserClient : public content::ContentBrowserClient {
public:
- virtual content::WebUIFactory* GetWebUIFactory() {
+ virtual content::WebUIFactory* GetWebUIFactory() OVERRIDE {
return &factory_;
}
- virtual bool IsURLSameAsAnySiteInstance(const GURL& url) {
+ virtual bool IsURLSameAsAnySiteInstance(const GURL& url) OVERRIDE {
return url.spec() == kSameAsAnyInstanceURL;
}
generated by cgit v1.1 at 2025-02-19 21:32:26 +0000