| OLD | NEW |
| 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/browser_titlebar.h" | 5 #include "chrome/browser/ui/gtk/browser_titlebar.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 app_mode_favicon_ = gtk_image_new_from_pixbuf( | 386 app_mode_favicon_ = gtk_image_new_from_pixbuf( |
| 387 rb.GetRTLEnabledPixbufNamed(IDR_PRODUCT_LOGO_16)); | 387 rb.GetRTLEnabledPixbufNamed(IDR_PRODUCT_LOGO_16)); |
| 388 g_object_set_data(G_OBJECT(app_mode_favicon_), "left-align-popup", | 388 g_object_set_data(G_OBJECT(app_mode_favicon_), "left-align-popup", |
| 389 reinterpret_cast<void*>(true)); | 389 reinterpret_cast<void*>(true)); |
| 390 gtk_container_add(GTK_CONTAINER(favicon_event_box), app_mode_favicon_); | 390 gtk_container_add(GTK_CONTAINER(favicon_event_box), app_mode_favicon_); |
| 391 | 391 |
| 392 if (IsTypePanel()) { | 392 if (IsTypePanel()) { |
| 393 panel_wrench_button_.reset( | 393 panel_wrench_button_.reset( |
| 394 BuildTitlebarButton(IDR_BALLOON_WRENCH, IDR_BALLOON_WRENCH_P, | 394 BuildTitlebarButton(IDR_BALLOON_WRENCH, IDR_BALLOON_WRENCH_P, |
| 395 IDR_BALLOON_WRENCH_H, app_mode_hbox, FALSE, | 395 IDR_BALLOON_WRENCH_H, app_mode_hbox, FALSE, |
| 396 IDS_NEW_TAB_APP_SETTINGS)); | 396 IDS_PANEL_WINDOW_SETTINGS_BUTTON_TOOLTIP)); |
| 397 g_signal_connect(panel_wrench_button_->widget(), "button-press-event", | 397 g_signal_connect(panel_wrench_button_->widget(), "button-press-event", |
| 398 G_CALLBACK(OnPanelSettingsMenuButtonPressedThunk), this); | 398 G_CALLBACK(OnPanelSettingsMenuButtonPressedThunk), this); |
| 399 gtk_widget_set_no_show_all(panel_wrench_button_->widget(), TRUE); | 399 gtk_widget_set_no_show_all(panel_wrench_button_->widget(), TRUE); |
| 400 } | 400 } |
| 401 | 401 |
| 402 app_mode_title_ = gtk_label_new(NULL); | 402 app_mode_title_ = gtk_label_new(NULL); |
| 403 gtk_label_set_ellipsize(GTK_LABEL(app_mode_title_), PANGO_ELLIPSIZE_END); | 403 gtk_label_set_ellipsize(GTK_LABEL(app_mode_title_), PANGO_ELLIPSIZE_END); |
| 404 gtk_misc_set_alignment(GTK_MISC(app_mode_title_), 0.0, 0.5); | 404 gtk_misc_set_alignment(GTK_MISC(app_mode_title_), 0.0, 0.5); |
| 405 gtk_box_pack_start(GTK_BOX(app_mode_hbox), app_mode_title_, TRUE, TRUE, | 405 gtk_box_pack_start(GTK_BOX(app_mode_hbox), app_mode_title_, TRUE, TRUE, |
| 406 0); | 406 0); |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1139 ui::SimpleMenuModel::Delegate* delegate) | 1139 ui::SimpleMenuModel::Delegate* delegate) |
| 1140 : SimpleMenuModel(delegate) { | 1140 : SimpleMenuModel(delegate) { |
| 1141 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 1141 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
| 1142 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 1142 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 1143 AddSeparator(); | 1143 AddSeparator(); |
| 1144 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 1144 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 1145 AddSeparator(); | 1145 AddSeparator(); |
| 1146 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 1146 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
| 1147 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 1147 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
| 1148 } | 1148 } |
| OLD | NEW |