Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/browser/ui/gtk/extension_install_prompt_gtk.cc

Issue 6627038: gtk: Rename OnDialogResponse() to OnResponse() to standardize on a consistent naming scheme. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // Currently this file is only used for the uninstall prompt. The install prompt 5 // Currently this file is only used for the uninstall prompt. The install prompt
6 // code is in extension_install_prompt2_gtk.cc. 6 // code is in extension_install_prompt2_gtk.cc.
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/browser_list.h" 12 #include "chrome/browser/browser_list.h"
13 #include "chrome/browser/browser_window.h" 13 #include "chrome/browser/browser_window.h"
14 #include "chrome/browser/extensions/extension_install_ui.h" 14 #include "chrome/browser/extensions/extension_install_ui.h"
15 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 15 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
16 #include "chrome/browser/ui/gtk/gtk_util.h" 16 #include "chrome/browser/ui/gtk/gtk_util.h"
17 #include "chrome/common/extensions/extension.h" 17 #include "chrome/common/extensions/extension.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/gfx/gtk_util.h" 20 #include "ui/gfx/gtk_util.h"
21 21
22 class Profile; 22 class Profile;
23 23
24 namespace { 24 namespace {
25 25
26 // Left or right margin. 26 // Left or right margin.
27 const int kPanelHorizMargin = 13; 27 const int kPanelHorizMargin = 13;
28 28
29 void OnDialogResponse(GtkDialog* dialog, int response_id, 29 void OnResponse(GtkWidget* dialog, int response_id,
30 ExtensionInstallUI::Delegate* delegate) { 30 ExtensionInstallUI::Delegate* delegate) {
31 if (response_id == GTK_RESPONSE_ACCEPT) { 31 if (response_id == GTK_RESPONSE_ACCEPT) {
32 delegate->InstallUIProceed(); 32 delegate->InstallUIProceed();
33 } else { 33 } else {
34 delegate->InstallUIAbort(); 34 delegate->InstallUIAbort();
35 } 35 }
36 36
37 gtk_widget_destroy(GTK_WIDGET(dialog)); 37 gtk_widget_destroy(dialog);
38 } 38 }
39 39
40 void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon, 40 void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon,
41 const Extension* extension, 41 const Extension* extension,
42 ExtensionInstallUI::Delegate *delegate, 42 ExtensionInstallUI::Delegate *delegate,
43 ExtensionInstallUI::PromptType type) { 43 ExtensionInstallUI::PromptType type) {
44 // Build the dialog. 44 // Build the dialog.
45 int title_id = ExtensionInstallUI::kTitleIds[type]; 45 int title_id = ExtensionInstallUI::kTitleIds[type];
46 int button_id = ExtensionInstallUI::kButtonIds[type]; 46 int button_id = ExtensionInstallUI::kButtonIds[type];
47 GtkWidget* dialog = gtk_dialog_new_with_buttons( 47 GtkWidget* dialog = gtk_dialog_new_with_buttons(
(...skipping 24 matching lines...) Expand all
72 GtkWidget* right_column_area = gtk_vbox_new(FALSE, 0); 72 GtkWidget* right_column_area = gtk_vbox_new(FALSE, 0);
73 gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0); 73 gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0);
74 74
75 int heading_id = ExtensionInstallUI::kHeadingIds[type]; 75 int heading_id = ExtensionInstallUI::kHeadingIds[type];
76 std::string heading_text = l10n_util::GetStringFUTF8( 76 std::string heading_text = l10n_util::GetStringFUTF8(
77 heading_id, UTF8ToUTF16(extension->name())); 77 heading_id, UTF8ToUTF16(extension->name()));
78 GtkWidget* heading_label = gtk_label_new(heading_text.c_str()); 78 GtkWidget* heading_label = gtk_label_new(heading_text.c_str());
79 gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5); 79 gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
80 gtk_box_pack_start(GTK_BOX(right_column_area), heading_label, TRUE, TRUE, 0); 80 gtk_box_pack_start(GTK_BOX(right_column_area), heading_label, TRUE, TRUE, 0);
81 81
82 g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), delegate); 82 g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), delegate);
83 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 83 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
84 gtk_widget_show_all(dialog); 84 gtk_widget_show_all(dialog);
85 } 85 }
86 86
87 } // namespace 87 } // namespace
88 88
89 void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( 89 void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl(
90 Profile* profile, 90 Profile* profile,
91 Delegate* delegate, 91 Delegate* delegate,
92 const Extension* extension, 92 const Extension* extension,
93 SkBitmap* icon, 93 SkBitmap* icon,
94 ExtensionInstallUI::PromptType type) { 94 ExtensionInstallUI::PromptType type) {
95 Browser* browser = BrowserList::GetLastActiveWithProfile(profile); 95 Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
96 if (!browser) { 96 if (!browser) {
97 delegate->InstallUIAbort(); 97 delegate->InstallUIAbort();
98 return; 98 return;
99 } 99 }
100 100
101 BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( 101 BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
102 browser->window()); 102 browser->window());
103 if (!browser_window) { 103 if (!browser_window) {
104 delegate->InstallUIAbort(); 104 delegate->InstallUIAbort();
105 return; 105 return;
106 } 106 }
107 107
108 ShowInstallPromptDialog(browser_window->window(), icon, extension, delegate, 108 ShowInstallPromptDialog(browser_window->window(), icon, extension, delegate,
109 type); 109 type);
110 } 110 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698