| OLD | NEW |
| 1 // Copyright (c) 2011 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/global_history_menu.h" | 5 #include "chrome/browser/ui/gtk/global_history_menu.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "base/string_number_conversions.h" | 12 #include "base/string_number_conversions.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/browser/history/top_sites.h" | 14 #include "chrome/browser/history/top_sites.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/sessions/tab_restore_service.h" | 16 #include "chrome/browser/sessions/tab_restore_service.h" |
| 17 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 17 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 18 #include "chrome/browser/themes/theme_service_factory.h" | 18 #include "chrome/browser/themes/theme_service_factory.h" |
| 19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 20 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" | 20 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" |
| 21 #include "chrome/browser/ui/gtk/global_menu_bar.h" | 21 #include "chrome/browser/ui/gtk/global_menu_bar.h" |
| 22 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | |
| 23 #include "chrome/browser/ui/gtk/gtk_util.h" | 22 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 23 #include "chrome/browser/ui/gtk/theme_service_gtk.h" |
| 24 #include "chrome/common/chrome_notification_types.h" | 24 #include "chrome/common/chrome_notification_types.h" |
| 25 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
| 26 #include "content/public/browser/notification_source.h" | 26 #include "content/public/browser/notification_source.h" |
| 27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
| 28 #include "ui/base/gtk/owned_widget_gtk.h" | 28 #include "ui/base/gtk/owned_widget_gtk.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
| 30 #include "ui/base/text/text_elider.h" | 30 #include "ui/base/text/text_elider.h" |
| 31 #include "ui/gfx/codec/png_codec.h" | 31 #include "ui/gfx/codec/png_codec.h" |
| 32 #include "ui/gfx/gtk_util.h" | 32 #include "ui/gfx/gtk_util.h" |
| 33 | 33 |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 tab_restore_service_->LoadTabsFromLastSession(); | 399 tab_restore_service_->LoadTabsFromLastSession(); |
| 400 tab_restore_service_->AddObserver(this); | 400 tab_restore_service_->AddObserver(this); |
| 401 | 401 |
| 402 // If LoadTabsFromLastSession doesn't load tabs, it won't call | 402 // If LoadTabsFromLastSession doesn't load tabs, it won't call |
| 403 // TabRestoreServiceChanged(). This ensures that all new windows after | 403 // TabRestoreServiceChanged(). This ensures that all new windows after |
| 404 // the first one will have their menus populated correctly. | 404 // the first one will have their menus populated correctly. |
| 405 TabRestoreServiceChanged(tab_restore_service_); | 405 TabRestoreServiceChanged(tab_restore_service_); |
| 406 } | 406 } |
| 407 } | 407 } |
| 408 } | 408 } |
| OLD | NEW |