Cleanup: Fix some lint errors in content/.
Review URL: https://chromiumcodereview.appspot.com/11740038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175210 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/renderer/disambiguation_popup_helper.cc b/content/renderer/disambiguation_popup_helper.cc
index 75bb9135..fbdd2ae 100644
--- a/content/renderer/disambiguation_popup_helper.cc
+++ b/content/renderer/disambiguation_popup_helper.cc
@@ -32,7 +32,7 @@
float FindOptimalScaleFactor(const WebVector<WebRect>& target_rects) {
using std::min;
using std::max;
- if (!target_rects.size()) // shall never reach
+ if (!target_rects.size()) // shall never reach
return kDisambiguationPopupMinScale;
int smallest_target = min(target_rects[0].width, target_rects[0].height);
for (size_t i = 1; i < target_rects.size(); i++) {
@@ -81,7 +81,7 @@
top + bottom);
}
-} // unnamed namespace
+} // namespace
namespace content {
@@ -103,4 +103,4 @@
return scale;
}
-} // namespace content
+} // namespace content
diff --git a/content/renderer/disambiguation_popup_helper.h b/content/renderer/disambiguation_popup_helper.h
index 84ee049..e6bf97e 100644
--- a/content/renderer/disambiguation_popup_helper.h
+++ b/content/renderer/disambiguation_popup_helper.h
@@ -29,6 +29,6 @@
gfx::Rect* zoom_rect);
};
-} // namespace content
+} // namespace content
-#endif // CONTENT_RENDERER_DISAMBIGUATION_POPUP_HELPER_H_
+#endif // CONTENT_RENDERER_DISAMBIGUATION_POPUP_HELPER_H_
diff --git a/content/renderer/disambiguation_popup_helper_unittest.cc b/content/renderer/disambiguation_popup_helper_unittest.cc
index b3da46a..f7b1909aa 100644
--- a/content/renderer/disambiguation_popup_helper_unittest.cc
+++ b/content/renderer/disambiguation_popup_helper_unittest.cc
@@ -15,7 +15,7 @@
namespace {
const float kDisambiguationPopupMaxScale = 5.0;
const float kDisambiguationPopupMinScale = 2.0;
-} // unnamed namespace
+} // unnamed namespace
namespace content {
@@ -78,4 +78,4 @@
EXPECT_TRUE(gfx::Rect(kViewportSize_).Contains(gfx::Rect(scaled_size)));
}
-} // namespace content
+} // namespace content
diff --git a/content/renderer/favicon_helper.cc b/content/renderer/favicon_helper.cc
index 5553047..770f2be5 100644
--- a/content/renderer/favicon_helper.cc
+++ b/content/renderer/favicon_helper.cc
@@ -32,6 +32,7 @@
namespace content {
namespace {
+
bool TouchEnabled() {
// Based on the definition of chrome::kEnableTouchIcon.
#if defined(OS_ANDROID)
@@ -41,7 +42,7 @@
#endif
}
-} // namespace
+} // namespace
static FaviconURL::IconType ToFaviconType(WebIconURL::Type type) {
@@ -189,4 +190,4 @@
SendUpdateFaviconURL(routing_id(), render_view()->GetPageId(), urls);
}
-} // namespace content
+} // namespace content
diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h
index a217c162..8375a24 100644
--- a/content/renderer/gamepad_shared_memory_reader.h
+++ b/content/renderer/gamepad_shared_memory_reader.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 CONTENT_RENDERER_GAMEPAD_UTIL_H_
-#define CONTENT_RENDERER_GAMEPAD_UTIL_H_
+#ifndef CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_
+#define CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_
#include "base/shared_memory.h"
#include "base/memory/scoped_ptr.h"
@@ -29,4 +29,4 @@
} // namespace content
-#endif // CONTENT_RENDERER_GAMEPAD_UTIL_H_
+#endif // CONTENT_RENDERER_GAMEPAD_SHARED_MEMORY_READER_H_
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index fee4cc7..c9df9fd 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -59,6 +59,7 @@
namespace content {
namespace {
+
#if defined(USE_AURA) && defined(USE_X11)
// Converts MockKeyboard::Modifiers to ui::EventFlags.
int ConvertMockKeyboardModifier(MockKeyboard::Modifiers modifiers) {
@@ -131,7 +132,7 @@
WebUITestWebUIControllerFactory factory_;
};
-}
+} // namespace
class RenderViewImplTest : public RenderViewTest {
public:
@@ -153,7 +154,8 @@
// Retrieve the Unicode character for the given tuple (keyboard-layout,
// key-code, and modifiers).
// Exit when a keyboard-layout driver cannot assign a Unicode character to
- // the tuple to prevent sending an invalid key code to the RenderView object.
+ // the tuple to prevent sending an invalid key code to the RenderView
+ // object.
CHECK(mock_keyboard_.get());
CHECK(output);
int length = mock_keyboard_->GetCharacters(layout, key_code, modifiers,
@@ -1820,7 +1822,7 @@
ExecuteJavaScript("document.getElementById('test1').focus();");
view()->OnSetEditableSelectionOffsets(4, 8);
const std::vector<WebKit::WebCompositionUnderline> empty_underline;
- view()->OnSetCompositionFromExistingText(7,10, empty_underline);
+ view()->OnSetCompositionFromExistingText(7, 10, empty_underline);
WebKit::WebTextInputInfo info = view()->webview()->textInputInfo();
EXPECT_EQ(4, info.selectionStart);
EXPECT_EQ(8, info.selectionEnd);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index bbc86d1..37d1011 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1915,8 +1915,9 @@
// 3d context.
return new CompositorOutputSurface(routing_id(), NULL,
new CompositorSoftwareOutputDeviceGLAdapter(context));
- } else
+ } else {
return new CompositorOutputSurface(routing_id(), context, NULL);
+ }
}
void RenderViewImpl::didAddMessageToConsole(
@@ -4269,7 +4270,7 @@
params.target_process_id = target_process_id_;
params.target_routing_id = target_routing_id_;
- std::map<int,int>::iterator it = active_frame_id_map_.find(
+ std::map<int, int>::iterator it = active_frame_id_map_.find(
targetFrame->identifier());
if (it != active_frame_id_map_.end()) {
params.target_frame_id = it->second;
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index e47ac5f..a1fe18d 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -363,7 +363,6 @@
new MimeRegistryMsg_GetMimeTypeFromExtension(
webkit_base::WebStringToFilePathString(file_extension), &mime_type));
return ASCIIToUTF16(mime_type);
-
}
WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
@@ -378,7 +377,6 @@
FilePath(webkit_base::WebStringToFilePathString(file_path)),
&mime_type));
return ASCIIToUTF16(mime_type);
-
}
WebString
@@ -665,7 +663,7 @@
WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent(
const WebKit::WebURL& url) {
- return WebKitPlatformSupportImpl::userAgent(url);
+ return WebKitPlatformSupportImpl::userAgent(url);
}
void RendererWebKitPlatformSupportImpl::GetPlugins(
diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc
index 2304f5dc..6a03488 100644
--- a/content/renderer/speech_recognition_dispatcher.cc
+++ b/content/renderer/speech_recognition_dispatcher.cc
@@ -149,9 +149,10 @@
recognizer_client_->didReceiveNoMatch(GetHandleFromID(request_id),
WebSpeechRecognitionResult());
} else {
- recognizer_client_->didReceiveError(GetHandleFromID(request_id),
- WebString(), // TODO(primiano): message?
- WebKitErrorCode(error.code));
+ recognizer_client_->didReceiveError(
+ GetHandleFromID(request_id),
+ WebString(), // TODO(primiano): message?
+ WebKitErrorCode(error.code));
}
}
diff --git a/content/renderer/web_intents_host.cc b/content/renderer/web_intents_host.cc
index 46aecfe1..2e34e00 100644
--- a/content/renderer/web_intents_host.cc
+++ b/content/renderer/web_intents_host.cc
@@ -63,7 +63,7 @@
}
}
-} // namespace
+} // namespace
class DeliveredIntentClientImpl : public WebDeliveredIntentClient {
public:
