summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-29 20:43:03 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-29 20:43:03 +0000
commite1d3a3269b394a994c79abf5ffe3832607e77176 (patch)
tree6a274244109266a5bef7bbcd82b3c96945801c28
parentf80f6063d2e6585512213f2e6f40750942843e80 (diff)
downloadchromium_src-e1d3a3269b394a994c79abf5ffe3832607e77176.zip
chromium_src-e1d3a3269b394a994c79abf5ffe3832607e77176.tar.gz
chromium_src-e1d3a3269b394a994c79abf5ffe3832607e77176.tar.bz2
Some code style cleanup under src/app.
BUG=None TEST=None Patch contributed by thiago.farina@gmail.com Review URL: http://codereview.chromium.org/173260 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24859 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--app/app_switches.h2
-rw-r--r--app/gfx/canvas.h2
-rw-r--r--app/gfx/color_utils.cc2
-rw-r--r--app/gfx/color_utils.h6
-rw-r--r--app/gfx/favicon_size.h2
-rw-r--r--app/gfx/icon_util.h6
-rw-r--r--app/gfx/insets.h4
-rw-r--r--app/gfx/path.h2
-rw-r--r--app/resource_bundle.cc2
-rw-r--r--app/resource_bundle.h4
-rw-r--r--app/win_util.cc6
11 files changed, 19 insertions, 19 deletions
diff --git a/app/app_switches.h b/app/app_switches.h
index 72038b9..1169b7f 100644
--- a/app/app_switches.h
+++ b/app/app_switches.h
@@ -13,4 +13,4 @@ extern const wchar_t kLang[];
} // namespace switches
-#endif // #ifndef APP_APP_SWITCHES_H_
+#endif // APP_APP_SWITCHES_H_
diff --git a/app/gfx/canvas.h b/app/gfx/canvas.h
index 4cb8695..553ec94 100644
--- a/app/gfx/canvas.h
+++ b/app/gfx/canvas.h
@@ -214,4 +214,4 @@ class Canvas : public skia::PlatformCanvas {
} // namespace gfx;
-#endif // #ifndef APP_GFX_CANVAS_H_
+#endif // APP_GFX_CANVAS_H_
diff --git a/app/gfx/color_utils.cc b/app/gfx/color_utils.cc
index 70ef31c..76c17cb 100644
--- a/app/gfx/color_utils.cc
+++ b/app/gfx/color_utils.cc
@@ -263,4 +263,4 @@ SkColor GetSysSkColor(int which) {
#endif
}
-} // namespace color_utils
+} // namespace color_utils
diff --git a/app/gfx/color_utils.h b/app/gfx/color_utils.h
index 9fb9cd4..f28f003 100644
--- a/app/gfx/color_utils.h
+++ b/app/gfx/color_utils.h
@@ -14,7 +14,7 @@ namespace color_utils {
// Represents set of CIE XYZ tristimulus values.
struct CIE_XYZ {
double X;
- double Y; // luminance
+ double Y; // luminance
double Z;
};
@@ -58,6 +58,6 @@ SkColor SetColorAlpha(SkColor c, SkAlpha alpha);
// Gets a Windows system color as a SkColor
SkColor GetSysSkColor(int which);
-} // namespace color_utils
+} // namespace color_utils
-#endif // #ifndef APP_GFX_COLOR_UTILS_H_
+#endif // APP_GFX_COLOR_UTILS_H_
diff --git a/app/gfx/favicon_size.h b/app/gfx/favicon_size.h
index fb66411..3fe9cd8 100644
--- a/app/gfx/favicon_size.h
+++ b/app/gfx/favicon_size.h
@@ -30,4 +30,4 @@ void calc_favicon_target_size(int* width, int* height) {
}
}
-#endif // APP_GFX_FAVICON_SIZE_H_
+#endif // APP_GFX_FAVICON_SIZE_H_
diff --git a/app/gfx/icon_util.h b/app/gfx/icon_util.h
index f7199ea..1ecbfb56 100644
--- a/app/gfx/icon_util.h
+++ b/app/gfx/icon_util.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 APP_ICON_UTIL_H_
-#define APP_ICON_UTIL_H_
+#ifndef APP_GFX_ICON_UTIL_H_
+#define APP_GFX_ICON_UTIL_H_
#include <windows.h>
#include <string>
@@ -190,4 +190,4 @@ class IconUtil {
DISALLOW_IMPLICIT_CONSTRUCTORS(IconUtil);
};
-#endif // APP_ICON_UTIL_H_
+#endif // APP_GFX_ICON_UTIL_H_
diff --git a/app/gfx/insets.h b/app/gfx/insets.h
index a90e3a4..6a4ac05 100644
--- a/app/gfx/insets.h
+++ b/app/gfx/insets.h
@@ -64,6 +64,6 @@ class Insets {
int right_;
};
-} // namespace
+} // namespace
-#endif // APP_GFX_INSETS_H_
+#endif // APP_GFX_INSETS_H_
diff --git a/app/gfx/path.h b/app/gfx/path.h
index 8062e34..e2150c2 100644
--- a/app/gfx/path.h
+++ b/app/gfx/path.h
@@ -38,4 +38,4 @@ class Path : public SkPath {
}
-#endif // #ifndef APP_GFX_PATH_H_
+#endif // APP_GFX_PATH_H_
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index e04f79e..c930fa3 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -187,7 +187,7 @@ void ResourceBundle::LoadFontsIfNecessary() {
gfx::Font ResourceBundle::GetFont(FontStyle style) {
LoadFontsIfNecessary();
- switch(style) {
+ switch (style) {
case SmallFont:
return *small_font_;
case MediumFont:
diff --git a/app/resource_bundle.h b/app/resource_bundle.h
index 85b4b65..51a8ff6 100644
--- a/app/resource_bundle.h
+++ b/app/resource_bundle.h
@@ -28,7 +28,7 @@ class DataPack;
#if defined(OS_LINUX)
typedef struct _GdkPixbuf GdkPixbuf;
#endif
-namespace gfx{
+namespace gfx {
class Font;
}
class SkBitmap;
@@ -226,4 +226,4 @@ class ResourceBundle {
DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
};
-#endif // APP_RESOURCE_BUNDLE_H_
+#endif // APP_RESOURCE_BUNDLE_H_
diff --git a/app/win_util.cc b/app/win_util.cc
index bbd2a04..af6c4be 100644
--- a/app/win_util.cc
+++ b/app/win_util.cc
@@ -243,14 +243,14 @@ std::wstring FormatFilterForExtensions(
const std::wstring all_ext = L"*.*";
const std::wstring all_desc = l10n_util::GetString(IDS_APP_SAVEAS_ALL_FILES);
- DCHECK(file_ext.size()>=ext_desc.size());
+ DCHECK(file_ext.size() >= ext_desc.size());
std::wstring result;
- for (size_t i=0; i<file_ext.size(); ++i) {
+ for (size_t i = 0; i < file_ext.size(); ++i) {
std::wstring ext = file_ext[i];
std::wstring desc;
- if (i<ext_desc.size())
+ if (i < ext_desc.size())
desc = ext_desc[i];
if (ext.empty()) {