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

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

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/gtk/avatar_menu_bubble_gtk.h" 5 #include "chrome/browser/ui/gtk/avatar_menu_bubble_gtk.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 GdkPixbuf* limited_user_pixbuf = 177 GdkPixbuf* limited_user_pixbuf =
178 avatar_menu_->GetManagedUserIcon().ToGdkPixbuf(); 178 avatar_menu_->GetManagedUserIcon().ToGdkPixbuf();
179 GtkWidget* limited_user_img = gtk_image_new_from_pixbuf(limited_user_pixbuf); 179 GtkWidget* limited_user_img = gtk_image_new_from_pixbuf(limited_user_pixbuf);
180 GtkWidget* icon_align = gtk_alignment_new(0, 0, 0, 0); 180 GtkWidget* icon_align = gtk_alignment_new(0, 0, 0, 0);
181 gtk_container_add(GTK_CONTAINER(icon_align), limited_user_img); 181 gtk_container_add(GTK_CONTAINER(icon_align), limited_user_img);
182 gtk_box_pack_start(GTK_BOX(managed_user_info), icon_align, FALSE, FALSE, 0); 182 gtk_box_pack_start(GTK_BOX(managed_user_info), icon_align, FALSE, FALSE, 0);
183 GtkWidget* status_label = 183 GtkWidget* status_label =
184 theme_service_->BuildLabel(std::string(), ui::kGdkBlack); 184 theme_service_->BuildLabel(std::string(), ui::kGdkBlack);
185 char* markup = g_markup_printf_escaped( 185 char* markup = g_markup_printf_escaped(
186 "<span size='small'>%s</span>", 186 "<span size='small'>%s</span>",
187 UTF16ToUTF8(avatar_menu_->GetManagedUserInformation()).c_str()); 187 base::UTF16ToUTF8(avatar_menu_->GetManagedUserInformation()).c_str());
188 const int kLabelWidth = 150; 188 const int kLabelWidth = 150;
189 gtk_widget_set_size_request(status_label, kLabelWidth, -1); 189 gtk_widget_set_size_request(status_label, kLabelWidth, -1);
190 gtk_label_set_markup(GTK_LABEL(status_label), markup); 190 gtk_label_set_markup(GTK_LABEL(status_label), markup);
191 gtk_label_set_line_wrap(GTK_LABEL(status_label), TRUE); 191 gtk_label_set_line_wrap(GTK_LABEL(status_label), TRUE);
192 gtk_misc_set_alignment(GTK_MISC(status_label), 0, 0); 192 gtk_misc_set_alignment(GTK_MISC(status_label), 0, 0);
193 g_free(markup); 193 g_free(markup);
194 gtk_box_pack_start(GTK_BOX(managed_user_info), status_label, FALSE, FALSE, 0); 194 gtk_box_pack_start(GTK_BOX(managed_user_info), status_label, FALSE, FALSE, 0);
195 gtk_box_pack_start( 195 gtk_box_pack_start(
196 GTK_BOX(inner_contents_), managed_user_info, FALSE, FALSE, 0); 196 GTK_BOX(inner_contents_), managed_user_info, FALSE, FALSE, 0);
197 197
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 if (bubble_) 230 if (bubble_)
231 gtk_widget_show_all(contents_); 231 gtk_widget_show_all(contents_);
232 } 232 }
233 233
234 void AvatarMenuBubbleGtk::CloseBubble() { 234 void AvatarMenuBubbleGtk::CloseBubble() {
235 if (bubble_) { 235 if (bubble_) {
236 bubble_->Close(); 236 bubble_->Close();
237 bubble_ = NULL; 237 bubble_ = NULL;
238 } 238 }
239 } 239 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/apps/native_app_window_gtk.cc ('k') | chrome/browser/ui/gtk/avatar_menu_item_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698