chrome/browser/ui/gtk/extensions/extension_install_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/extensions/extension_install_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/edit_search_engine_dialog.cc ('k') | chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

index 889a85e52d5387383e9aabe7ad41f8b11dbf3dba..c9a58060998e77ef6fcc212919af5c5670eb6932 100644

--- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

+++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

@@ -15,6 +15,7 @@

#include "chrome/common/extensions/extension.h"

#include "grit/generated_resources.h"

#include "skia/ext/image_operations.h"

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

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

#include "ui/gfx/gtk_util.h"

@@ -75,9 +76,9 @@ void ShowInstallDialog(GtkWindow* parent,

// Create a two column layout.

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* icon_hbox = gtk_hbox_new(FALSE, gtk_util::kContentAreaSpacing);

+ GtkWidget* icon_hbox = gtk_hbox_new(FALSE, ui::kContentAreaSpacing);

gtk_box_pack_start(GTK_BOX(content_area), icon_hbox, TRUE, TRUE, 0);

// Resize the icon if necessary.

@@ -97,7 +98,7 @@ void ShowInstallDialog(GtkWindow* parent,

gtk_misc_set_alignment(GTK_MISC(icon), 0.5, 0.0);

// Create a new vbox for the right column.

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

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

gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0);

std::string heading_text = l10n_util::GetStringFUTF8(