summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajose <ajose@chromium.org>2015-07-28 16:42:27 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-28 23:43:09 +0000
commit1e515a6cb6dea7df8a92dd51fe5bd55759ec34ca (patch)
tree291a1ac4618af3f36025b67fd1a049326a4ab89a
parentd937879ed54975426f3c5c9e5b1366847e7b85fa (diff)
downloadchromium_src-1e515a6cb6dea7df8a92dd51fe5bd55759ec34ca.zip
chromium_src-1e515a6cb6dea7df8a92dd51fe5bd55759ec34ca.tar.gz
chromium_src-1e515a6cb6dea7df8a92dd51fe5bd55759ec34ca.tar.bz2
Make use of '// static' consistent.
Review URL: https://codereview.chromium.org/1211973011 Cr-Commit-Position: refs/heads/master@{#340807}
-rw-r--r--android_webview/native/aw_message_port_service_impl.cc2
-rw-r--r--android_webview/native/input_stream_impl.cc2
-rw-r--r--ash/wm/window_resizer.cc2
-rw-r--r--base/process/process_info_linux.cc2
-rw-r--r--base/process/process_info_mac.cc2
-rw-r--r--content/browser/devtools/devtools_agent_host_impl.cc2
-rw-r--r--content/browser/devtools/render_frame_devtools_agent_host.cc2
-rw-r--r--content/browser/renderer_host/media/video_capture_buffer_pool.cc2
-rw-r--r--content/child/simple_webmimeregistry_impl.cc2
-rw-r--r--content/renderer/drop_data_builder.cc2
-rw-r--r--device/bluetooth/bluetooth_adapter.cc2
-rw-r--r--device/vibration/vibration_manager_impl_default.cc2
-rw-r--r--net/ssl/channel_id_service.cc2
-rw-r--r--remoting/base/rsa_key_pair.cc4
-rw-r--r--sandbox/linux/services/proc_util.cc2
-rw-r--r--ui/gfx/animation/tween.cc2
-rw-r--r--ui/gfx/display.cc2
-rw-r--r--ui/views/background.cc10
18 files changed, 23 insertions, 23 deletions
diff --git a/android_webview/native/aw_message_port_service_impl.cc b/android_webview/native/aw_message_port_service_impl.cc
index 7e06019..969842d 100644
--- a/android_webview/native/aw_message_port_service_impl.cc
+++ b/android_webview/native/aw_message_port_service_impl.cc
@@ -25,7 +25,7 @@ using base::android::ToJavaIntArray;
using content::BrowserThread;
using content::MessagePortProvider;
-//static
+// static
AwMessagePortServiceImpl* AwMessagePortServiceImpl::GetInstance() {
return static_cast<AwMessagePortServiceImpl*>(
AwBrowserContext::GetDefault()->GetMessagePortService());
diff --git a/android_webview/native/input_stream_impl.cc b/android_webview/native/input_stream_impl.cc
index 78219aa..55f40db 100644
--- a/android_webview/native/input_stream_impl.cc
+++ b/android_webview/native/input_stream_impl.cc
@@ -34,7 +34,7 @@ bool RegisterInputStream(JNIEnv* env) {
// Maximum number of bytes to be read in a single read.
const int InputStreamImpl::kBufferSize = 4096;
-//static
+// static
const InputStreamImpl* InputStreamImpl::FromInputStream(
const InputStream* input_stream) {
return static_cast<const InputStreamImpl*>(input_stream);
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
index fbdc29c..eeeb5a3 100644
--- a/ash/wm/window_resizer.cc
+++ b/ash/wm/window_resizer.cc
@@ -89,7 +89,7 @@ int WindowResizer::GetBoundsChangeForWindowComponent(int component) {
return bounds_change;
}
-//static
+// static
int WindowResizer::GetPositionChangeDirectionForWindowComponent(
int window_component) {
int pos_change_direction = WindowResizer::kBoundsChangeDirection_None;
diff --git a/base/process/process_info_linux.cc b/base/process/process_info_linux.cc
index 9ec2313..88ae5a1 100644
--- a/base/process/process_info_linux.cc
+++ b/base/process/process_info_linux.cc
@@ -12,7 +12,7 @@
namespace base {
-//static
+// static
const Time CurrentProcessInfo::CreationTime() {
ProcessHandle pid = GetCurrentProcessHandle();
int64 start_ticks =
diff --git a/base/process/process_info_mac.cc b/base/process/process_info_mac.cc
index b7cfdce..7680d37 100644
--- a/base/process/process_info_mac.cc
+++ b/base/process/process_info_mac.cc
@@ -14,7 +14,7 @@
namespace base {
-//static
+// static
const Time CurrentProcessInfo::CreationTime() {
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
size_t len = 0;
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
index cff2fe8e..cfe65e5 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -98,7 +98,7 @@ scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForId(
return it->second;
}
-//static
+// static
scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::Create(
DevToolsExternalAgentProxyDelegate* delegate) {
return new ForwardingAgentHost(delegate);
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index ca3c86c..0fc8ce9 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -265,7 +265,7 @@ bool DevToolsAgentHost::IsDebuggerAttached(WebContents* web_contents) {
return agent_host && agent_host->IsAttached();
}
-//static
+// static
void RenderFrameDevToolsAgentHost::AddAllAgentHosts(
DevToolsAgentHost::List* result) {
base::Callback<void(RenderFrameHost*)> callback = base::Bind(
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
index 23afce8..38a579b 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -193,7 +193,7 @@ bool VideoCaptureBufferPool::GpuMemoryBufferTracker::Init(
return true;
}
-//static
+// static
scoped_ptr<VideoCaptureBufferPool::Tracker>
VideoCaptureBufferPool::Tracker::CreateTracker(bool use_gmb) {
if (!use_gmb)
diff --git a/content/child/simple_webmimeregistry_impl.cc b/content/child/simple_webmimeregistry_impl.cc
index a3b1c7f..9893681 100644
--- a/content/child/simple_webmimeregistry_impl.cc
+++ b/content/child/simple_webmimeregistry_impl.cc
@@ -17,7 +17,7 @@ using blink::WebMimeRegistry;
namespace content {
-//static
+// static
std::string SimpleWebMimeRegistryImpl::ToASCIIOrEmpty(const WebString& string) {
return base::IsStringASCII(string)
? base::UTF16ToASCII(base::StringPiece16(string))
diff --git a/content/renderer/drop_data_builder.cc b/content/renderer/drop_data_builder.cc
index a1d10cd..37b7231 100644
--- a/content/renderer/drop_data_builder.cc
+++ b/content/renderer/drop_data_builder.cc
@@ -16,7 +16,7 @@ using blink::WebVector;
namespace content {
-//static
+// static
DropData DropDataBuilder::Build(const WebDragData& drag_data) {
DropData result;
result.referrer_policy = blink::WebReferrerPolicyDefault;
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index 2aa2b66..747ac60 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -18,7 +18,7 @@ BluetoothAdapter::ServiceOptions::~ServiceOptions() {
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
!defined(OS_WIN)
-//static
+// static
base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter(
const InitCallback& init_callback) {
return base::WeakPtr<BluetoothAdapter>();
diff --git a/device/vibration/vibration_manager_impl_default.cc b/device/vibration/vibration_manager_impl_default.cc
index 4d4f5b4..1291722 100644
--- a/device/vibration/vibration_manager_impl_default.cc
+++ b/device/vibration/vibration_manager_impl_default.cc
@@ -30,7 +30,7 @@ class VibrationManagerEmptyImpl : public VibrationManager {
} // namespace
-//static
+// static
void VibrationManagerImpl::Create(
mojo::InterfaceRequest<VibrationManager> request) {
new VibrationManagerEmptyImpl(request.Pass());
diff --git a/net/ssl/channel_id_service.cc b/net/ssl/channel_id_service.cc
index 57f9ef9..cfa61cc 100644
--- a/net/ssl/channel_id_service.cc
+++ b/net/ssl/channel_id_service.cc
@@ -297,7 +297,7 @@ ChannelIDService::~ChannelIDService() {
STLDeleteValues(&inflight_);
}
-//static
+// static
std::string ChannelIDService::GetDomainForHost(const std::string& host) {
std::string domain =
registry_controlled_domains::GetDomainAndRegistry(
diff --git a/remoting/base/rsa_key_pair.cc b/remoting/base/rsa_key_pair.cc
index a8ca5d0..366d93d 100644
--- a/remoting/base/rsa_key_pair.cc
+++ b/remoting/base/rsa_key_pair.cc
@@ -25,7 +25,7 @@ RsaKeyPair::RsaKeyPair(scoped_ptr<crypto::RSAPrivateKey> key)
RsaKeyPair::~RsaKeyPair() {}
-//static
+// static
scoped_refptr<RsaKeyPair> RsaKeyPair::Generate() {
scoped_ptr<crypto::RSAPrivateKey> key(crypto::RSAPrivateKey::Create(2048));
if (!key) {
@@ -35,7 +35,7 @@ scoped_refptr<RsaKeyPair> RsaKeyPair::Generate() {
return new RsaKeyPair(key.Pass());
}
-//static
+// static
scoped_refptr<RsaKeyPair> RsaKeyPair::FromString(
const std::string& key_base64) {
std::string key_str;
diff --git a/sandbox/linux/services/proc_util.cc b/sandbox/linux/services/proc_util.cc
index d3f755f..8341b4a 100644
--- a/sandbox/linux/services/proc_util.cc
+++ b/sandbox/linux/services/proc_util.cc
@@ -111,7 +111,7 @@ bool ProcUtil::HasOpenDirectory() {
return HasOpenDirectory(proc_fd.get());
}
-//static
+// static
base::ScopedFD ProcUtil::OpenProc() {
return OpenDirectory("/proc/");
}
diff --git a/ui/gfx/animation/tween.cc b/ui/gfx/animation/tween.cc
index 0e21bc3..79b074c 100644
--- a/ui/gfx/animation/tween.cc
+++ b/ui/gfx/animation/tween.cc
@@ -148,7 +148,7 @@ int Tween::IntValueBetween(double value, int start, int target) {
#endif
}
-//static
+// static
int Tween::LinearIntValueBetween(double value, int start, int target) {
// NOTE: Do not use ToRoundedInt()! See comments on function declaration.
return ToFlooredInt(0.5 + DoubleValueBetween(value, start, target));
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
index 1dc9ad3..03949cb 100644
--- a/ui/gfx/display.cc
+++ b/ui/gfx/display.cc
@@ -59,7 +59,7 @@ float Display::GetForcedDeviceScaleFactor() {
return g_forced_device_scale_factor;
}
-//static
+// static
bool Display::HasForceDeviceScaleFactor() {
if (g_has_forced_device_scale_factor == -1)
g_has_forced_device_scale_factor = HasForceDeviceScaleFactorImpl();
diff --git a/ui/views/background.cc b/ui/views/background.cc
index 0fbd0ec..62cdc3b 100644
--- a/ui/views/background.cc
+++ b/ui/views/background.cc
@@ -85,18 +85,18 @@ HBRUSH Background::GetNativeControlBrush() const {
}
#endif
-//static
+// static
Background* Background::CreateSolidBackground(SkColor color) {
return new SolidBackground(color);
}
-//static
+// static
Background* Background::CreateStandardPanelBackground() {
// TODO(beng): Should be in NativeTheme.
return CreateSolidBackground(SK_ColorWHITE);
}
-//static
+// static
Background* Background::CreateVerticalGradientBackground(SkColor color1,
SkColor color2) {
Background* background = CreateBackgroundPainter(
@@ -107,7 +107,7 @@ Background* Background::CreateVerticalGradientBackground(SkColor color1,
return background;
}
-//static
+// static
Background* Background::CreateVerticalMultiColorGradientBackground(
SkColor* colors,
SkScalar* pos,
@@ -120,7 +120,7 @@ Background* Background::CreateVerticalMultiColorGradientBackground(
return background;
}
-//static
+// static
Background* Background::CreateBackgroundPainter(bool owns_painter,
Painter* painter) {
return new BackgroundPainter(owns_painter, painter);