chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc - Issue 7748026: content: Reapply "Start splitting up chrome/browser/ui/gtk/gtk_util.h" (r98287)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc

Issue 7748026: content: Reapply "Start splitting up chrome/browser/ui/gtk/gtk_util.h" (r98287) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase on Monday. Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/importer/import_lock_dialog_gtk.cc ('k') | chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc

diff --git a/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc

index a8f0b3634207c2afe23c95cb6badd993e979cb07..c32ce9b42e46c2a210b1462743e6ef5a4e12170b 100644

--- a/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc

+++ b/chrome/browser/ui/gtk/importer/import_progress_dialog_gtk.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/ui/gtk/gtk_util.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

+#include "ui/base/gtk/gtk_hig_constants.h"

#include "ui/base/l10n/l10n_util.h"

namespace {

@@ -82,9 +83,9 @@ ImportProgressDialogGtk::ImportProgressDialogGtk(

importer_host_->set_parent_window(GTK_WINDOW(dialog_));

GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_));

- gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);

+ gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);

- GtkWidget* control_group = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);

+ GtkWidget* control_group = gtk_vbox_new(FALSE, ui::kControlSpacing);

GtkWidget* import_info = gtk_label_new(

l10n_util::GetStringFUTF8(IDS_IMPORT_PROGRESS_INFO,

@@ -92,7 +93,7 @@ ImportProgressDialogGtk::ImportProgressDialogGtk(

gtk_util::SetLabelWidth(import_info, 400);

gtk_box_pack_start(GTK_BOX(control_group), import_info, FALSE, FALSE, 0);

- GtkWidget* item_box = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);

+ GtkWidget* item_box = gtk_vbox_new(FALSE, ui::kControlSpacing);

if (items_ & importer::HISTORY) {

history_ = gtk_label_new(