summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/extensions/bindings_utils.h2
-rw-r--r--chrome/renderer/extensions/js_only_v8_extensions.h2
-rw-r--r--chrome/renderer/external_extension.cc2
-rw-r--r--chrome/renderer/external_extension.h6
-rw-r--r--chrome/renderer/loadtimes_extension_bindings.h6
-rw-r--r--chrome/renderer/localized_error.h6
-rw-r--r--chrome/renderer/net/render_dns_master.h6
-rw-r--r--chrome/renderer/plugin_channel_host.h6
-rw-r--r--chrome/renderer/render_thread.h2
-rw-r--r--chrome/renderer/renderer_histogram_snapshots.h6
-rw-r--r--chrome/renderer/renderer_main_platform_delegate.h8
-rw-r--r--chrome/renderer/renderer_sandbox_support_linux.h6
-rw-r--r--chrome/renderer/renderer_web_database_observer.h2
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.h6
-rw-r--r--chrome/renderer/renderer_webstoragearea_impl.h2
-rw-r--r--chrome/renderer/renderer_webstoragenamespace_impl.h2
-rw-r--r--chrome/renderer/spellchecker/spellcheck.h6
-rw-r--r--chrome/renderer/user_script_slave.h6
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.h10
-rw-r--r--chrome/renderer/websharedworkerrepository_impl.h6
20 files changed, 49 insertions, 49 deletions
diff --git a/chrome/renderer/extensions/bindings_utils.h b/chrome/renderer/extensions/bindings_utils.h
index 471023c..558bd64 100644
--- a/chrome/renderer/extensions/bindings_utils.h
+++ b/chrome/renderer/extensions/bindings_utils.h
@@ -119,7 +119,7 @@ RenderView* GetRenderViewForCurrentContext();
// Call the named javascript function with the given arguments in a context.
// The function name should be reachable from the chromeHidden object, and can
-// be a sub-property like "Port.dispatchOnMessage". Returns the result of
+// be a sub-property like "Port.dispatchOnMessage". Returns the result of
// the function call. If an exception is thrown an empty Handle will be
// returned.
v8::Handle<v8::Value> CallFunctionInContext(v8::Handle<v8::Context> context,
diff --git a/chrome/renderer/extensions/js_only_v8_extensions.h b/chrome/renderer/extensions/js_only_v8_extensions.h
index 79b6c30..b87860f 100644
--- a/chrome/renderer/extensions/js_only_v8_extensions.h
+++ b/chrome/renderer/extensions/js_only_v8_extensions.h
@@ -28,4 +28,4 @@ class ExtensionApiTestV8Extension {
static v8::Extension* Get();
};
-#endif // CHROME_RENDERER_JS_ONLY_V8_EXTENSIONS_H_
+#endif // CHROME_RENDERER_EXTENSIONS_JS_ONLY_V8_EXTENSIONS_H_
diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc
index f0e0bd5..e31c422 100644
--- a/chrome/renderer/external_extension.cc
+++ b/chrome/renderer/external_extension.cc
@@ -51,7 +51,7 @@ class ExternalExtensionWrapper : public v8::Extension {
if (!renderview) return v8::Undefined();
std::string name = std::string(*v8::String::Utf8Value(args[0]));
- if (!name.length()) return v8::Undefined();;
+ if (!name.length()) return v8::Undefined();
renderview->AddSearchProvider(name);
return v8::Undefined();
diff --git a/chrome/renderer/external_extension.h b/chrome/renderer/external_extension.h
index d9e7b27..b5cb78b 100644
--- a/chrome/renderer/external_extension.h
+++ b/chrome/renderer/external_extension.h
@@ -4,8 +4,8 @@
// Implements the window.external object.
-#ifndef CHROME_RENDERER_EXTENSIONS_V8_EXTERNAL_EXTENSION_H_
-#define CHROME_RENDERER_EXTENSIONS_V8_EXTERNAL_EXTENSION_H_
+#ifndef CHROME_RENDERER_EXTERNAL_EXTENSION_H_
+#define CHROME_RENDERER_EXTERNAL_EXTENSION_H_
namespace v8 {
class Extension;
@@ -20,4 +20,4 @@ class ExternalExtension {
} // namespace extensions_v8
-#endif // CHROME_RENDERER_EXTENSIONS_V8_EXTERNAL_EXTENSION_H_
+#endif // CHROME_RENDERER_EXTERNAL_EXTENSION_H_
diff --git a/chrome/renderer/loadtimes_extension_bindings.h b/chrome/renderer/loadtimes_extension_bindings.h
index 4a6bcf5..c97b0b1 100644
--- a/chrome/renderer/loadtimes_extension_bindings.h
+++ b/chrome/renderer/loadtimes_extension_bindings.h
@@ -5,8 +5,8 @@
// The LoadTimesExtension is a v8 extension to access the time it took
// to load a page.
-#ifndef CHROME_RENDERER_EXTENSIONS_LOADTIMES_EXTENSION_BINDINGS_H_
-#define CHROME_RENDERER_EXTENSIONS_LOADTIMES_EXTENSION_BINDINGS_H_
+#ifndef CHROME_RENDERER_LOADTIMES_EXTENSION_BINDINGS_H_
+#define CHROME_RENDERER_LOADTIMES_EXTENSION_BINDINGS_H_
namespace v8 {
class Extension;
@@ -21,4 +21,4 @@ class LoadTimesExtension {
} // namespace extensions_v8
-#endif // CHROME_RENDERER_EXTENSIONS_LOADTIMES_EXTENSION_BINDINGS_H_
+#endif // CHROME_RENDERER_LOADTIMES_EXTENSION_BINDINGS_H_
diff --git a/chrome/renderer/localized_error.h b/chrome/renderer/localized_error.h
index ff7da34..33300c4 100644
--- a/chrome/renderer/localized_error.h
+++ b/chrome/renderer/localized_error.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_RENDERER_LOCALIZED_ERROR_VALUES_H__
-#define CHROME_RENDERER_LOCALIZED_ERROR_VALUES_H__
+#ifndef CHROME_RENDERER_LOCALIZED_ERROR_H_
+#define CHROME_RENDERER_LOCALIZED_ERROR_H_
class DictionaryValue;
class GURL;
@@ -22,4 +22,4 @@ void GetLocalizedErrorValues(const WebKit::WebURLError& error,
void GetFormRepostErrorValues(const GURL& display_url,
DictionaryValue* error_strings);
-#endif // CHROME_RENDERER_LOCALIZED_ERROR_VALUES_H__
+#endif // CHROME_RENDERER_LOCALIZED_ERROR_H_
diff --git a/chrome/renderer/net/render_dns_master.h b/chrome/renderer/net/render_dns_master.h
index 81f1d32..fa735de 100644
--- a/chrome/renderer/net/render_dns_master.h
+++ b/chrome/renderer/net/render_dns_master.h
@@ -18,8 +18,8 @@
// sent names. If the entire queue is processed, then the list of "sent names"
// is cleared so that future gatherings may again pass along the same names.
-#ifndef CHROME_RENDERER_RENDER_NET_DNS_MASTER_H__
-#define CHROME_RENDERER_RENDER_NET_DNS_MASTER_H__
+#ifndef CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
+#define CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
#include <map>
#include <string>
@@ -106,4 +106,4 @@ class RenderDnsMaster {
DISALLOW_EVIL_CONSTRUCTORS(RenderDnsMaster);
}; // class RenderDnsMaster
-#endif // CHROME_RENDERER_RENDER_NET_DNS_MASTER_H__
+#endif // CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
diff --git a/chrome/renderer/plugin_channel_host.h b/chrome/renderer/plugin_channel_host.h
index b37ab99..53289b9 100644
--- a/chrome/renderer/plugin_channel_host.h
+++ b/chrome/renderer/plugin_channel_host.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_PLUGIN_PLUGIN_CHANNEL_HOST_H__
-#define CHROME_PLUGIN_PLUGIN_CHANNEL_HOST_H__
+#ifndef CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
+#define CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
#include "base/hash_tables.h"
#include "chrome/plugin/plugin_channel_base.h"
@@ -54,4 +54,4 @@ class PluginChannelHost : public PluginChannelBase {
DISALLOW_EVIL_CONSTRUCTORS(PluginChannelHost);
};
-#endif // CHROME_PLUGIN_PLUGIN_CHANNEL_HOST_H__
+#endif // CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index bca3ea6..44dc6ab 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -81,7 +81,7 @@ class RenderThread : public RenderThreadBase,
// Grabs the IPC channel name from the command line.
RenderThread();
// Constructor that's used when running in single process mode.
- RenderThread(const std::string& channel_name);
+ explicit RenderThread(const std::string& channel_name);
virtual ~RenderThread();
// Returns the one render thread for this process. Note that this should only
diff --git a/chrome/renderer/renderer_histogram_snapshots.h b/chrome/renderer/renderer_histogram_snapshots.h
index 0a1238c..db4cd4b 100644
--- a/chrome/renderer/renderer_histogram_snapshots.h
+++ b/chrome/renderer/renderer_histogram_snapshots.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_RENDERER_HISTOGRAM_SNAPSHOTS_H_
-#define CHROME_RENDERER_HISTOGRAM_SNAPSHOTS_H_
+#ifndef CHROME_RENDERER_RENDERER_HISTOGRAM_SNAPSHOTS_H_
+#define CHROME_RENDERER_RENDERER_HISTOGRAM_SNAPSHOTS_H_
#include <list>
#include <map>
@@ -50,4 +50,4 @@ class RendererHistogramSnapshots {
DISALLOW_COPY_AND_ASSIGN(RendererHistogramSnapshots);
};
-#endif // CHROME_RENDERER_HISTOGRAM_SNAPSHOTS_H_
+#endif // CHROME_RENDERER_RENDERER_HISTOGRAM_SNAPSHOTS_H_
diff --git a/chrome/renderer/renderer_main_platform_delegate.h b/chrome/renderer/renderer_main_platform_delegate.h
index 8f1e453..3f9c426 100644
--- a/chrome/renderer/renderer_main_platform_delegate.h
+++ b/chrome/renderer/renderer_main_platform_delegate.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_RENDERER_RENDERER_PLATFORM_DELEGATE_H_
-#define CHROME_RENDERER_RENDERER_PLATFORM_DELEGATE_H_
+#ifndef CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
+#define CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
#include "chrome/common/main_function_params.h"
class RendererMainPlatformDelegate {
public:
- RendererMainPlatformDelegate(const MainFunctionParams& parameters);
+ explicit RendererMainPlatformDelegate(const MainFunctionParams& parameters);
~RendererMainPlatformDelegate();
// Called first thing and last thing in the process' lifecycle, i.e. before
@@ -36,4 +36,4 @@ class RendererMainPlatformDelegate {
DISALLOW_COPY_AND_ASSIGN(RendererMainPlatformDelegate);
};
-#endif // CHROME_RENDERER_RENDERER_PLATFORM_DELEGATE_H_
+#endif // CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
diff --git a/chrome/renderer/renderer_sandbox_support_linux.h b/chrome/renderer/renderer_sandbox_support_linux.h
index b7d6b77..f8f080e 100644
--- a/chrome/renderer/renderer_sandbox_support_linux.h
+++ b/chrome/renderer/renderer_sandbox_support_linux.h
@@ -2,8 +2,8 @@
// source code is governed by a BSD-style license that can be found in the
// LICENSE file.
-#ifndef CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_H_
-#define CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_H_
+#ifndef CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
+#define CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
#include <stdint.h>
@@ -22,4 +22,4 @@ std::string getFontFamilyForCharacters(const uint16_t* utf16, size_t num_utf16);
}; // namespace render_sandbox_support
-#endif // CHROME_RENDERER_RENDER_SANDBOX_SUPPORT_H_
+#endif // CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
diff --git a/chrome/renderer/renderer_web_database_observer.h b/chrome/renderer/renderer_web_database_observer.h
index 4c06853..8d7ce56 100644
--- a/chrome/renderer/renderer_web_database_observer.h
+++ b/chrome/renderer/renderer_web_database_observer.h
@@ -19,4 +19,4 @@ class RendererWebDatabaseObserver : public WebKit::WebDatabaseObserver {
IPC::Message::Sender* sender_;
};
-#endif // CHROME_RENDERER_WEB_DATABASE_OBSERVER_H_
+#endif // CHROME_RENDERER_RENDERER_WEB_DATABASE_OBSERVER_H_
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index cf97ad7..eb77dce 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -2,8 +2,8 @@
// source code is governed by a BSD-style license that can be found in the
// LICENSE file.
-#ifndef CHROME_RENDERER_RENDERER_WEBKIT_CLIENT_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBKIT_CLIENT_IMPL_H_
+#ifndef CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
+#define CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
#include "base/platform_file.h"
#include "chrome/renderer/websharedworkerrepository_impl.h"
@@ -122,4 +122,4 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
};
-#endif // CHROME_RENDERER_WEBKIT_CLIENT_IMPL_H_
+#endif // CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
diff --git a/chrome/renderer/renderer_webstoragearea_impl.h b/chrome/renderer/renderer_webstoragearea_impl.h
index 2a13bf8..040c9db 100644
--- a/chrome/renderer/renderer_webstoragearea_impl.h
+++ b/chrome/renderer/renderer_webstoragearea_impl.h
@@ -32,4 +32,4 @@ class RendererWebStorageAreaImpl : public WebKit::WebStorageArea {
int64 storage_area_id_;
};
-#endif // CHROME_RENDERER_WEBSTORAGEAREA_IMPL_H_
+#endif // CHROME_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h
index fd01435..391a157 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.h
+++ b/chrome/renderer/renderer_webstoragenamespace_impl.h
@@ -33,4 +33,4 @@ class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace {
static const int64 kUninitializedNamespaceId = -1;
};
-#endif // CHROME_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
+#endif // CHROME_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h
index eb3ad82..ef194bd 100644
--- a/chrome/renderer/spellchecker/spellcheck.h
+++ b/chrome/renderer/spellchecker/spellcheck.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECKER_H_
-#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECKER_H_
+#ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
+#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
#include <queue>
#include <string>
@@ -120,4 +120,4 @@ class SpellCheck {
DISALLOW_COPY_AND_ASSIGN(SpellCheck);
};
-#endif // CHROME_RENDERER_SPELLCHECKER_SPELLCHECKER_H_
+#endif // CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h
index 5d3ae6b..6c32c42 100644
--- a/chrome/renderer/user_script_slave.h
+++ b/chrome/renderer/user_script_slave.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
-#define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
+#ifndef CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
+#define CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
#include <map>
#include <string>
@@ -53,4 +53,4 @@ class UserScriptSlave {
DISALLOW_COPY_AND_ASSIGN(UserScriptSlave);
};
-#endif // CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
+#endif // CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 5aa7a4a..d9cb3b3 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -36,11 +36,11 @@ class WaitableEvent;
// An implementation of WebPluginDelegate that proxies all calls to
// the plugin process.
-class WebPluginDelegateProxy :
- public webkit_glue::WebPluginDelegate,
- public IPC::Channel::Listener,
- public IPC::Message::Sender,
- public base::SupportsWeakPtr<WebPluginDelegateProxy> {
+class WebPluginDelegateProxy
+ : public webkit_glue::WebPluginDelegate,
+ public IPC::Channel::Listener,
+ public IPC::Message::Sender,
+ public base::SupportsWeakPtr<WebPluginDelegateProxy> {
public:
WebPluginDelegateProxy(const std::string& mime_type,
const base::WeakPtr<RenderView>& render_view);
diff --git a/chrome/renderer/websharedworkerrepository_impl.h b/chrome/renderer/websharedworkerrepository_impl.h
index 5806485..eb20c2d 100644
--- a/chrome/renderer/websharedworkerrepository_impl.h
+++ b/chrome/renderer/websharedworkerrepository_impl.h
@@ -2,8 +2,8 @@
// source code is governed by a BSD-style license that can be found in the
// LICENSE file.
-#ifndef CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_
-#define CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_
+#ifndef CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
+#define CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorkerRepository.h"
@@ -27,4 +27,4 @@ class WebSharedWorkerRepositoryImpl : public WebKit::WebSharedWorkerRepository {
DocumentSet shared_worker_parents_;
};
-#endif // CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_
+#endif // CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_