| 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 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/profiles/profile_info_cache.h" | 23 #include "chrome/browser/profiles/profile_info_cache.h" |
| 24 #include "chrome/browser/profiles/profile_manager.h" | 24 #include "chrome/browser/profiles/profile_manager.h" |
| 25 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
| 26 #include "chrome/browser/ui/gtk/accelerators_gtk.h" | 26 #include "chrome/browser/ui/gtk/accelerators_gtk.h" |
| 27 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h" | 27 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h" |
| 28 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 28 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 29 #include "chrome/browser/ui/gtk/custom_button.h" | 29 #include "chrome/browser/ui/gtk/custom_button.h" |
| 30 #if defined(USE_GCONF) | 30 #if defined(USE_GCONF) |
| 31 #include "chrome/browser/ui/gtk/gconf_titlebar_listener.h" | 31 #include "chrome/browser/ui/gtk/gconf_titlebar_listener.h" |
| 32 #endif | 32 #endif |
| 33 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | |
| 34 #include "chrome/browser/ui/gtk/gtk_util.h" | 33 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 35 #include "chrome/browser/ui/gtk/menu_gtk.h" | 34 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 36 #include "chrome/browser/ui/gtk/nine_box.h" | 35 #include "chrome/browser/ui/gtk/nine_box.h" |
| 37 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" | 36 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
| 37 #include "chrome/browser/ui/gtk/theme_service_gtk.h" |
| 38 #include "chrome/browser/ui/gtk/unity_service.h" | 38 #include "chrome/browser/ui/gtk/unity_service.h" |
| 39 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 39 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
| 40 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 40 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 41 #include "chrome/common/chrome_notification_types.h" | 41 #include "chrome/common/chrome_notification_types.h" |
| 42 #include "chrome/common/chrome_switches.h" | 42 #include "chrome/common/chrome_switches.h" |
| 43 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
| 44 #include "content/public/browser/notification_service.h" | 44 #include "content/public/browser/notification_service.h" |
| 45 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
| 46 #include "grit/generated_resources.h" | 46 #include "grit/generated_resources.h" |
| 47 #include "grit/theme_resources.h" | 47 #include "grit/theme_resources.h" |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 | 394 |
| 395 app_mode_title_ = gtk_label_new(NULL); | 395 app_mode_title_ = gtk_label_new(NULL); |
| 396 gtk_label_set_ellipsize(GTK_LABEL(app_mode_title_), PANGO_ELLIPSIZE_END); | 396 gtk_label_set_ellipsize(GTK_LABEL(app_mode_title_), PANGO_ELLIPSIZE_END); |
| 397 gtk_misc_set_alignment(GTK_MISC(app_mode_title_), 0.0, 0.5); | 397 gtk_misc_set_alignment(GTK_MISC(app_mode_title_), 0.0, 0.5); |
| 398 gtk_box_pack_start(GTK_BOX(app_mode_hbox), app_mode_title_, TRUE, TRUE, | 398 gtk_box_pack_start(GTK_BOX(app_mode_hbox), app_mode_title_, TRUE, TRUE, |
| 399 0); | 399 0); |
| 400 | 400 |
| 401 UpdateTitleAndIcon(); | 401 UpdateTitleAndIcon(); |
| 402 } | 402 } |
| 403 | 403 |
| 404 theme_service_ = GtkThemeService::GetFrom( | 404 theme_service_ = ThemeServiceGtk::GetFrom( |
| 405 browser_window_->browser()->profile()); | 405 browser_window_->browser()->profile()); |
| 406 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, | 406 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, |
| 407 content::Source<ThemeService>(theme_service_)); | 407 content::Source<ThemeService>(theme_service_)); |
| 408 theme_service_->InitThemesFor(this); | 408 theme_service_->InitThemesFor(this); |
| 409 | 409 |
| 410 gtk_widget_show_all(container_); | 410 gtk_widget_show_all(container_); |
| 411 | 411 |
| 412 ui::ActiveWindowWatcherX::AddObserver(this); | 412 ui::ActiveWindowWatcherX::AddObserver(this); |
| 413 } | 413 } |
| 414 | 414 |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1160 ui::SimpleMenuModel::Delegate* delegate) | 1160 ui::SimpleMenuModel::Delegate* delegate) |
| 1161 : SimpleMenuModel(delegate) { | 1161 : SimpleMenuModel(delegate) { |
| 1162 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 1162 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
| 1163 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 1163 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 1164 AddSeparator(); | 1164 AddSeparator(); |
| 1165 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 1165 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 1166 AddSeparator(); | 1166 AddSeparator(); |
| 1167 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 1167 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
| 1168 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 1168 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
| 1169 } | 1169 } |
| OLD | NEW |