Commit fbc36932 authored by sergeyu@chromium.org's avatar sergeyu@chromium.org

Revert 182318 - Broke linux build:...

Revert 182318 - Broke linux build: http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Builder/builds/18695/steps/compile/logs/stdio
> ExtensionInstallDialog should create the accept button if it requested in prompt.GetDialogButtons().
> 
> BUG=175897
> TEST=NONE
> 
> Review URL: https://chromiumcodereview.appspot.com/12208144

TBR=ncj674@motorola.com
Review URL: https://codereview.chromium.org/12207163

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182322 0039d316-1c4b-4281-b951-d872f2087c98
parent 0d2cec98
...@@ -135,12 +135,10 @@ ExtensionInstallDialog::ExtensionInstallDialog( ...@@ -135,12 +135,10 @@ ExtensionInstallDialog::ExtensionInstallDialog(
prompt.HasAbortButtonLabel() ? prompt.HasAbortButtonLabel() ?
UTF16ToUTF8(prompt.GetAbortButtonLabel()).c_str() : GTK_STOCK_CANCEL, UTF16ToUTF8(prompt.GetAbortButtonLabel()).c_str() : GTK_STOCK_CANCEL,
GTK_RESPONSE_CLOSE); GTK_RESPONSE_CLOSE);
if (prompt.GetDialogButtons() & ui::DIALOG_BUTTON_OK) { gtk_dialog_add_button(
gtk_dialog_add_button( GTK_DIALOG(dialog_),
GTK_DIALOG(dialog_), UTF16ToUTF8(prompt.GetAcceptButtonLabel()).c_str(),
UTF16ToUTF8(prompt.GetAcceptButtonLabel()).c_str(), GTK_RESPONSE_ACCEPT);
GTK_RESPONSE_ACCEPT);
}
#if !GTK_CHECK_VERSION(2, 22, 0) #if !GTK_CHECK_VERSION(2, 22, 0)
gtk_dialog_set_has_separator(GTK_DIALOG(dialog_), FALSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog_), FALSE);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment