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

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

Issue 1073005: Move RTL related functions from app/l10n_util to base/i18n/rtl... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 | Annotate | Revision Log
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/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/i18n/rtl.h"
8 #include "chrome/browser/blocked_popup_container.h" 9 #include "chrome/browser/blocked_popup_container.h"
9 #include "chrome/browser/content_setting_bubble_model.h" 10 #include "chrome/browser/content_setting_bubble_model.h"
10 #include "chrome/browser/gtk/gtk_chrome_link_button.h" 11 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
11 #include "chrome/browser/gtk/gtk_theme_provider.h" 12 #include "chrome/browser/gtk/gtk_theme_provider.h"
12 #include "chrome/browser/gtk/gtk_util.h" 13 #include "chrome/browser/gtk/gtk_util.h"
13 #include "chrome/browser/gtk/options/content_settings_window_gtk.h" 14 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
14 #include "chrome/browser/host_content_settings_map.h" 15 #include "chrome/browser/host_content_settings_map.h"
15 #include "chrome/browser/profile.h" 16 #include "chrome/browser/profile.h"
16 #include "chrome/browser/tab_contents/tab_contents.h" 17 #include "chrome/browser/tab_contents/tab_contents.h"
17 #include "chrome/common/content_settings.h" 18 #include "chrome/common/content_settings.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0); 159 gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0);
159 160
160 GtkWidget* button = gtk_button_new_with_label( 161 GtkWidget* button = gtk_button_new_with_label(
161 l10n_util::GetStringUTF8(IDS_DONE).c_str()); 162 l10n_util::GetStringUTF8(IDS_DONE).c_str());
162 g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClicked), this); 163 g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClicked), this);
163 gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0); 164 gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0);
164 165
165 gtk_box_pack_start(GTK_BOX(bubble_content), bottom_box, FALSE, FALSE, 0); 166 gtk_box_pack_start(GTK_BOX(bubble_content), bottom_box, FALSE, FALSE, 0);
166 167
167 InfoBubbleGtk::ArrowLocationGtk arrow_location = 168 InfoBubbleGtk::ArrowLocationGtk arrow_location =
168 (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT) ? 169 !base::i18n::IsRTL() ?
169 InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT : 170 InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT :
170 InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT; 171 InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT;
171 info_bubble_ = InfoBubbleGtk::Show( 172 info_bubble_ = InfoBubbleGtk::Show(
172 toplevel_window_, 173 toplevel_window_,
173 bounds_, 174 bounds_,
174 bubble_content, 175 bubble_content,
175 arrow_location, 176 arrow_location,
176 true, 177 true,
177 theme_provider, 178 theme_provider,
178 this); 179 this);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 bubble->Close(); 231 bubble->Close();
231 } 232 }
232 233
233 // static 234 // static
234 void ContentSettingBubbleGtk::OnManageLinkClicked( 235 void ContentSettingBubbleGtk::OnManageLinkClicked(
235 GtkButton* button, 236 GtkButton* button,
236 ContentSettingBubbleGtk* bubble) { 237 ContentSettingBubbleGtk* bubble) {
237 bubble->content_setting_bubble_model_->OnManageLinkClicked(); 238 bubble->content_setting_bubble_model_->OnManageLinkClicked();
238 bubble->Close(); 239 bubble->Close();
239 } 240 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/gtk/edit_search_engine_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698