summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 20:38:12 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 20:38:12 +0000
commit71c5c3b6906dbca8db3a3de52f459c4d30d036be (patch)
tree8270d974ccdd5ac7417d38fb684619305fdf82c9 /ui
parent815d5f4e41b1ea064b090efad24d9cf8dca21776 (diff)
downloadchromium_src-71c5c3b6906dbca8db3a3de52f459c4d30d036be.zip
chromium_src-71c5c3b6906dbca8db3a3de52f459c4d30d036be.tar.gz
chromium_src-71c5c3b6906dbca8db3a3de52f459c4d30d036be.tar.bz2
Revert "content: Start splitting up chrome/browser/ui/gtk/gtk_util.h"
This reverts r98287. BUG=93804 Review URL: http://codereview.chromium.org/7749017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/gtk/gtk_hig_constants.cc16
-rw-r--r--ui/base/gtk/gtk_hig_constants.h58
-rw-r--r--ui/ui.gyp2
3 files changed, 0 insertions, 76 deletions
diff --git a/ui/base/gtk/gtk_hig_constants.cc b/ui/base/gtk/gtk_hig_constants.cc
deleted file mode 100644
index f9d0280c..0000000
--- a/ui/base/gtk/gtk_hig_constants.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/base/gtk/gtk_hig_constants.h"
-
-#include <gdk/gdk.h>
-
-namespace ui {
-
-const GdkColor kGdkWhite = GDK_COLOR_RGB(0xff, 0xff, 0xff);
-const GdkColor kGdkGray = GDK_COLOR_RGB(0x7f, 0x7f, 0x7f);
-const GdkColor kGdkBlack = GDK_COLOR_RGB(0x00, 0x00, 0x00);
-const GdkColor kGdkGreen = GDK_COLOR_RGB(0x00, 0xff, 0x00);
-
-} // namespace ui
diff --git a/ui/base/gtk/gtk_hig_constants.h b/ui/base/gtk/gtk_hig_constants.h
deleted file mode 100644
index d868b2a..0000000
--- a/ui/base/gtk/gtk_hig_constants.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// A list of constants that are used in setting up GTK widgets.
-//
-// This contains named color constants, along with spacing constants from the
-// GNOME Human Interface Guide.
-
-#ifndef UI_BASE_GTK_GTK_HIG_CONSTANTS_H_
-#define UI_BASE_GTK_GTK_HIG_CONSTANTS_H_
-#pragma once
-
-#include "ui/base/ui_export.h"
-
-typedef struct _GdkColor GdkColor;
-
-namespace ui {
-
-// Multiply uint8 color components by this.
-const int kSkiaToGDKMultiplier = 257;
-
-// Named color constants.
-UI_EXPORT extern const GdkColor kGdkWhite;
-UI_EXPORT extern const GdkColor kGdkGray;
-UI_EXPORT extern const GdkColor kGdkBlack;
-UI_EXPORT extern const GdkColor kGdkGreen;
-
-// Constants relating to the layout of dialog windows:
-// (See http://library.gnome.org/devel/hig-book/stable/design-window.html.en)
-
-// Spacing between controls of the same group.
-const int kControlSpacing = 6;
-
-// Horizontal spacing between a label and its control.
-const int kLabelSpacing = 12;
-
-// Indent of the controls within each group.
-const int kGroupIndent = 12;
-
-// Space around the outside of a dialog's contents.
-const int kContentAreaBorder = 12;
-
-// Spacing between groups of controls.
-const int kContentAreaSpacing = 18;
-
-// Horizontal Spacing between controls in a form.
-const int kFormControlSpacing = 10;
-
-} // namespace ui
-
-// 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 * ::ui::kSkiaToGDKMultiplier, \
- g * ::ui::kSkiaToGDKMultiplier, b * ::ui::kSkiaToGDKMultiplier}
-
-#endif // UI_BASE_GTK_GTK_HIG_CONSTANTS_H_
diff --git a/ui/ui.gyp b/ui/ui.gyp
index ed5f16de..3f5a2fe 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -112,8 +112,6 @@
'base/gtk/gtk_floating_container.h',
'base/gtk/gtk_im_context_util.cc',
'base/gtk/gtk_im_context_util.h',
- 'base/gtk/gtk_hig_constants.cc',
- 'base/gtk/gtk_hig_constants.h',
'base/gtk/gtk_signal.h',
'base/gtk/gtk_signal_registrar.cc',
'base/gtk/gtk_signal_registrar.h',