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

Side by Side Diff: chrome/browser/gtk/content_blocked_bubble_gtk.cc

Issue 661235: Rename button from "Close" to "Done" on bookmark bubble and content bubbles. (Closed)
Patch Set: Created 10 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
« no previous file with comments | « chrome/browser/gtk/bookmark_bubble_gtk.cc ('k') | chrome/browser/views/bookmark_bubble_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/browser/gtk/content_blocked_bubble_gtk.h" 5 #include "chrome/browser/gtk/content_blocked_bubble_gtk.h"
6 6
7 #include "app/gfx/gtk_util.h" 7 #include "app/gfx/gtk_util.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "chrome/browser/blocked_popup_container.h" 9 #include "chrome/browser/blocked_popup_container.h"
10 #include "chrome/browser/gtk/gtk_chrome_link_button.h" 10 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 }; 196 };
197 DCHECK_EQ(arraysize(kLinkIDs), 197 DCHECK_EQ(arraysize(kLinkIDs),
198 static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES)); 198 static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
199 GtkWidget* manage_link = gtk_chrome_link_button_new(l10n_util::GetStringUTF8( 199 GtkWidget* manage_link = gtk_chrome_link_button_new(l10n_util::GetStringUTF8(
200 kLinkIDs[content_type_]).c_str()); 200 kLinkIDs[content_type_]).c_str());
201 g_signal_connect(manage_link, "clicked", G_CALLBACK(OnManageLinkClicked), 201 g_signal_connect(manage_link, "clicked", G_CALLBACK(OnManageLinkClicked),
202 this); 202 this);
203 gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0); 203 gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0);
204 204
205 GtkWidget* button = gtk_button_new_with_label( 205 GtkWidget* button = gtk_button_new_with_label(
206 l10n_util::GetStringUTF8(IDS_CLOSE).c_str()); 206 l10n_util::GetStringUTF8(IDS_DONE).c_str());
207 g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClicked), this); 207 g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClicked), this);
208 gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0); 208 gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0);
209 209
210 gtk_box_pack_start(GTK_BOX(bubble_content), bottom_box, FALSE, FALSE, 0); 210 gtk_box_pack_start(GTK_BOX(bubble_content), bottom_box, FALSE, FALSE, 0);
211 211
212 InfoBubbleGtk::ArrowLocationGtk arrow_location = 212 InfoBubbleGtk::ArrowLocationGtk arrow_location =
213 (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT) ? 213 (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT) ?
214 InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT : 214 InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT :
215 InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT; 215 InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT;
216 info_bubble_ = InfoBubbleGtk::Show( 216 info_bubble_ = InfoBubbleGtk::Show(
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 if (bubble->tab_contents_) { 278 if (bubble->tab_contents_) {
279 bubble->tab_contents_->delegate()->ShowContentSettingsWindow( 279 bubble->tab_contents_->delegate()->ShowContentSettingsWindow(
280 bubble->content_type_); 280 bubble->content_type_);
281 } else { 281 } else {
282 ContentSettingsWindowGtk::Show(NULL, bubble->content_type_, 282 ContentSettingsWindowGtk::Show(NULL, bubble->content_type_,
283 bubble->profile_); 283 bubble->profile_);
284 } 284 }
285 285
286 bubble->Close(); 286 bubble->Close();
287 } 287 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/bookmark_bubble_gtk.cc ('k') | chrome/browser/views/bookmark_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698