| Index: chrome/browser/ui/libgtkui/skia_utils_gtk2.h
|
| diff --git a/chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h b/chrome/browser/ui/libgtkui/skia_utils_gtk2.h
|
| similarity index 73%
|
| rename from chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h
|
| rename to chrome/browser/ui/libgtkui/skia_utils_gtk2.h
|
| index ccb6563229ffa411fe988d6b2eeaa966f710e1b9..df2d53ac093eddcfe51815053ea8d8b69eddb140 100644
|
| --- a/chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h
|
| +++ b/chrome/browser/ui/libgtkui/skia_utils_gtk2.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_UI_LIBGTK2UI_SKIA_UTILS_GTK2_H_
|
| -#define CHROME_BROWSER_UI_LIBGTK2UI_SKIA_UTILS_GTK2_H_
|
| +#ifndef CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK2_H_
|
| +#define CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK2_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -17,11 +17,11 @@ class SkBitmap;
|
| // Define a macro for creating GdkColors from RGB values. This is a macro to
|
| // allow static construction of literals, etc. Use this like:
|
| // GdkColor white = GDK_COLOR_RGB(0xff, 0xff, 0xff);
|
| -#define GDK_COLOR_RGB(r, g, b) {0, r * ::libgtk2ui::kSkiaToGDKMultiplier, \
|
| - g * ::libgtk2ui::kSkiaToGDKMultiplier, \
|
| - b * ::libgtk2ui::kSkiaToGDKMultiplier}
|
| +#define GDK_COLOR_RGB(r, g, b) {0, r * ::libgtkui::kSkiaToGDKMultiplier, \
|
| + g * ::libgtkui::kSkiaToGDKMultiplier, \
|
| + b * ::libgtkui::kSkiaToGDKMultiplier}
|
|
|
| -namespace libgtk2ui {
|
| +namespace libgtkui {
|
|
|
| // Multiply uint8_t color components by this.
|
| const int kSkiaToGDKMultiplier = 257;
|
| @@ -39,6 +39,6 @@ const SkBitmap GdkPixbufToImageSkia(GdkPixbuf* pixbuf);
|
| // 1, and the caller is responsible for unrefing it when done.
|
| GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap);
|
|
|
| -} // namespace libgtk2ui
|
| +} // namespace libgtkui
|
|
|
| -#endif // CHROME_BROWSER_UI_LIBGTK2UI_SKIA_UTILS_GTK2_H_
|
| +#endif // CHROME_BROWSER_UI_LIBGTKUI_SKIA_UTILS_GTK2_H_
|
|
|