chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc - Issue 1234223005: Initial gtk3 support

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/libgtk2ui/select_file_dialog_impl_gtk2.cc

Issue 1234223005: Initial gtk3 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Silence gtk memory leak Created 5 years, 3 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/libgtk2ui/print_dialog_gtk2.cc ('k') | chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

index abeab2936f1064e1f1a6323fb2a91d823ad45dc0..91daa5cdc9b6de2c516d45bc11f4735484a120ee 100644

--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc

@@ -386,8 +386,8 @@ GtkWidget* SelectFileDialogImplGTK::CreateFileOpenHelper(

GtkWidget* dialog =

gtk_file_chooser_dialog_new(title.c_str(), NULL,

GTK_FILE_CHOOSER_ACTION_OPEN,

- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,

+ "_Cancel", GTK_RESPONSE_CANCEL,

+ "_Open", GTK_RESPONSE_ACCEPT,

NULL);

SetGtkTransientForAura(dialog, parent);

AddFilters(GTK_FILE_CHOOSER(dialog));

@@ -422,12 +422,12 @@ GtkWidget* SelectFileDialogImplGTK::CreateSelectFolderDialog(

}

std::string accept_button_label = (type == SELECT_UPLOAD_FOLDER) ?

l10n_util::GetStringUTF8(IDS_SELECT_UPLOAD_FOLDER_DIALOG_UPLOAD_BUTTON) :

- GTK_STOCK_OPEN;

+ "_Open";

GtkWidget* dialog =

gtk_file_chooser_dialog_new(title_string.c_str(), NULL,

GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,

- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

+ "_Cancel", GTK_RESPONSE_CANCEL,

accept_button_label.c_str(),

GTK_RESPONSE_ACCEPT,

NULL);

@@ -482,8 +482,8 @@ GtkWidget* SelectFileDialogImplGTK::CreateSaveAsDialog(const std::string& title,

GtkWidget* dialog =

gtk_file_chooser_dialog_new(title_string.c_str(), NULL,

GTK_FILE_CHOOSER_ACTION_SAVE,

- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,

+ "_Cancel", GTK_RESPONSE_CANCEL,

+ "_Save", GTK_RESPONSE_ACCEPT,

NULL);

SetGtkTransientForAura(dialog, parent);