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

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

Issue 8917011: Change signature of |ui::ElideText()|. Add a truncate mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 #include "chrome/browser/ui/gtk/avatar_menu_item_gtk.h" 5 #include "chrome/browser/ui/gtk/avatar_menu_item_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 g_object_unref(avatar_pixbuf); 246 g_object_unref(avatar_pixbuf);
247 gtk_misc_set_alignment(GTK_MISC(avatar_image), 0, 0); 247 gtk_misc_set_alignment(GTK_MISC(avatar_image), 0, 0);
248 gtk_box_pack_start(GTK_BOX(item_hbox), avatar_image, FALSE, FALSE, 0); 248 gtk_box_pack_start(GTK_BOX(item_hbox), avatar_image, FALSE, FALSE, 0);
249 249
250 // The user name label. 250 // The user name label.
251 GtkWidget* item_vbox = gtk_vbox_new(FALSE, 0); 251 GtkWidget* item_vbox = gtk_vbox_new(FALSE, 0);
252 GtkWidget* name_label = NULL; 252 GtkWidget* name_label = NULL;
253 string16 elided_name = ui::ElideText(item_.name, 253 string16 elided_name = ui::ElideText(item_.name,
254 gfx::Font(), 254 gfx::Font(),
255 kUserNameMaxWidth, 255 kUserNameMaxWidth,
256 /* elide_in_middle */ false); 256 ui::ELIDE_AT_END);
257 if (item_.active) { 257 if (item_.active) {
258 name_label = gtk_util::CreateBoldLabel(UTF16ToUTF8(elided_name)); 258 name_label = gtk_util::CreateBoldLabel(UTF16ToUTF8(elided_name));
259 } else { 259 } else {
260 name_label = theme_service->BuildLabel(UTF16ToUTF8(elided_name), 260 name_label = theme_service->BuildLabel(UTF16ToUTF8(elided_name),
261 ui::kGdkBlack); 261 ui::kGdkBlack);
262 } 262 }
263 gtk_misc_set_alignment(GTK_MISC(name_label), 0, 0); 263 gtk_misc_set_alignment(GTK_MISC(name_label), 0, 0);
264 gtk_box_pack_start(GTK_BOX(item_vbox), name_label, TRUE, TRUE, 0); 264 gtk_box_pack_start(GTK_BOX(item_vbox), name_label, TRUE, TRUE, 0);
265 265
266 // The sync status label. 266 // The sync status label.
(...skipping 28 matching lines...) Expand all
295 295
296 GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); 296 GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
297 gtk_size_group_add_widget(size_group, status_label_); 297 gtk_size_group_add_widget(size_group, status_label_);
298 gtk_size_group_add_widget(size_group, link_alignment_); 298 gtk_size_group_add_widget(size_group, link_alignment_);
299 g_object_unref(size_group); 299 g_object_unref(size_group);
300 } 300 }
301 301
302 gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0); 302 gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
303 gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox); 303 gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
304 } 304 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698