| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/views/frame/global_menu_bar_x11.h" | 5 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h" |
| 6 | 6 |
| 7 #include <dlfcn.h> | 7 #include <dlfcn.h> |
| 8 #include <glib-object.h> | 8 #include <glib-object.h> |
| 9 | 9 |
| 10 #include "base/debug/leak_annotations.h" | 10 #include "base/debug/leak_annotations.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
| 13 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
| 14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
| 15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
| 17 #include "chrome/app/chrome_command_ids.h" | 17 #include "chrome/app/chrome_command_ids.h" |
| 18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 19 #include "chrome/browser/history/top_sites.h" | |
| 20 #include "chrome/browser/history/top_sites_factory.h" | 19 #include "chrome/browser/history/top_sites_factory.h" |
| 21 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
| 22 #include "chrome/browser/profiles/profile_info_cache.h" | 21 #include "chrome/browser/profiles/profile_info_cache.h" |
| 23 #include "chrome/browser/profiles/profile_manager.h" | 22 #include "chrome/browser/profiles/profile_manager.h" |
| 24 #include "chrome/browser/sessions/tab_restore_service.h" | 23 #include "chrome/browser/sessions/tab_restore_service.h" |
| 25 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 24 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 26 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
| 27 #include "chrome/browser/ui/browser_commands.h" | 26 #include "chrome/browser/ui/browser_commands.h" |
| 28 #include "chrome/browser/ui/browser_list.h" | 27 #include "chrome/browser/ui/browser_list.h" |
| 29 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" | 28 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" |
| 30 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" | 29 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h" |
| 31 #include "chrome/browser/ui/views/frame/browser_view.h" | 30 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 32 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" | 31 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" |
| 33 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
| 34 #include "chrome/grit/generated_resources.h" | 33 #include "chrome/grit/generated_resources.h" |
| 34 #include "components/history/core/browser/top_sites.h" |
| 35 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" | 35 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h" |
| 36 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
| 37 #include "ui/events/keycodes/keyboard_code_conversion_x.h" | 37 #include "ui/events/keycodes/keyboard_code_conversion_x.h" |
| 38 #include "ui/gfx/text_elider.h" | 38 #include "ui/gfx/text_elider.h" |
| 39 | 39 |
| 40 // libdbusmenu-glib types | 40 // libdbusmenu-glib types |
| 41 typedef struct _DbusmenuMenuitem DbusmenuMenuitem; | 41 typedef struct _DbusmenuMenuitem DbusmenuMenuitem; |
| 42 typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)(); | 42 typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)(); |
| 43 typedef bool (*dbusmenu_menuitem_child_add_position_func)( | 43 typedef bool (*dbusmenu_menuitem_child_add_position_func)( |
| 44 DbusmenuMenuitem* parent, | 44 DbusmenuMenuitem* parent, |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 888 void GlobalMenuBarX11::OnEditProfileItemActivated(DbusmenuMenuitem* sender, | 888 void GlobalMenuBarX11::OnEditProfileItemActivated(DbusmenuMenuitem* sender, |
| 889 unsigned int timestamp) { | 889 unsigned int timestamp) { |
| 890 int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), kProfileId)); | 890 int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), kProfileId)); |
| 891 avatar_menu_->EditProfile(id); | 891 avatar_menu_->EditProfile(id); |
| 892 } | 892 } |
| 893 | 893 |
| 894 void GlobalMenuBarX11::OnCreateProfileItemActivated(DbusmenuMenuitem* sender, | 894 void GlobalMenuBarX11::OnCreateProfileItemActivated(DbusmenuMenuitem* sender, |
| 895 unsigned int timestamp) { | 895 unsigned int timestamp) { |
| 896 avatar_menu_->AddNewProfile(ProfileMetrics::ADD_NEW_USER_MENU); | 896 avatar_menu_->AddNewProfile(ProfileMetrics::ADD_NEW_USER_MENU); |
| 897 } | 897 } |
| OLD | NEW |