diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 20:38:12 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 20:38:12 +0000 |
| commit | 71c5c3b6906dbca8db3a3de52f459c4d30d036be (patch) | |
| tree | 8270d974ccdd5ac7417d38fb684619305fdf82c9 /chrome/browser/ui/gtk/first_run_bubble.cc | |
| parent | 815d5f4e41b1ea064b090efad24d9cf8dca21776 (diff) | |
| download | chromium_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 'chrome/browser/ui/gtk/first_run_bubble.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/first_run_bubble.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/ui/gtk/first_run_bubble.cc b/chrome/browser/ui/gtk/first_run_bubble.cc index aacc0fe..86c6f42 100644 --- a/chrome/browser/ui/gtk/first_run_bubble.cc +++ b/chrome/browser/ui/gtk/first_run_bubble.cc @@ -17,7 +17,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "ui/base/gtk/gtk_hig_constants.h" #include "ui/base/l10n/l10n_util.h" namespace { @@ -102,7 +101,7 @@ FirstRunBubble::~FirstRunBubble() { void FirstRunBubble::InitializeContentForLarge( std::vector<GtkWidget*>* labels) { - GtkWidget* label1 = theme_service_->BuildLabel("", ui::kGdkBlack); + GtkWidget* label1 = theme_service_->BuildLabel("", gtk_util::kGdkBlack); labels->push_back(label1); char* markup = g_markup_printf_escaped(kSearchLabelMarkup, l10n_util::GetStringUTF8(IDS_FR_BUBBLE_TITLE).c_str()); @@ -110,13 +109,13 @@ void FirstRunBubble::InitializeContentForLarge( g_free(markup); GtkWidget* label2 = theme_service_->BuildLabel( - l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), ui::kGdkBlack); + l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), gtk_util::kGdkBlack); labels->push_back(label2); string16 search_engine = GetDefaultSearchEngineName(profile_); GtkWidget* label3 = theme_service_->BuildLabel( l10n_util::GetStringFUTF8(IDS_FR_BUBBLE_QUESTION, search_engine), - ui::kGdkBlack); + gtk_util::kGdkBlack); labels->push_back(label3); GtkWidget* keep_button = gtk_button_new_with_label( @@ -155,7 +154,7 @@ void FirstRunBubble::InitializeContentForOEM(std::vector<GtkWidget*>* labels) { void FirstRunBubble::InitializeContentForMinimal( std::vector<GtkWidget*>* labels) { - GtkWidget* label1 = theme_service_->BuildLabel("", ui::kGdkBlack); + GtkWidget* label1 = theme_service_->BuildLabel("", gtk_util::kGdkBlack); labels->push_back(label1); char* markup = g_markup_printf_escaped(kSearchLabelMarkup, l10n_util::GetStringFUTF8( @@ -165,7 +164,7 @@ void FirstRunBubble::InitializeContentForMinimal( g_free(markup); GtkWidget* label2 = theme_service_->BuildLabel( - l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), ui::kGdkBlack); + l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), gtk_util::kGdkBlack); labels->push_back(label2); gtk_box_pack_start(GTK_BOX(content_), label1, FALSE, FALSE, 0); |