| 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_toolbar_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" | 
| 6 | 6 | 
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> | 
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> | 
| 9 #include <X11/XF86keysym.h> | 9 #include <X11/XF86keysym.h> | 
| 10 | 10 | 
| 11 #include "base/base_paths.h" | 11 #include "base/base_paths.h" | 
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" | 
| 13 #include "base/debug/trace_event.h" | 13 #include "base/debug/trace_event.h" | 
| 14 #include "base/i18n/rtl.h" | 14 #include "base/i18n/rtl.h" | 
| 15 #include "base/logging.h" | 15 #include "base/logging.h" | 
| 16 #include "base/memory/singleton.h" | 16 #include "base/memory/singleton.h" | 
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" | 
|  | 18 #include "base/prefs/pref_service.h" | 
| 18 #include "chrome/app/chrome_command_ids.h" | 19 #include "chrome/app/chrome_command_ids.h" | 
| 19 #include "chrome/browser/net/url_fixer_upper.h" | 20 #include "chrome/browser/net/url_fixer_upper.h" | 
| 20 #include "chrome/browser/prefs/pref_service.h" |  | 
| 21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" | 
| 22 #include "chrome/browser/themes/theme_service.h" | 22 #include "chrome/browser/themes/theme_service.h" | 
| 23 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" | 
| 24 #include "chrome/browser/ui/browser_commands.h" | 24 #include "chrome/browser/ui/browser_commands.h" | 
| 25 #include "chrome/browser/ui/global_error/global_error_service.h" | 25 #include "chrome/browser/ui/global_error/global_error_service.h" | 
| 26 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 26 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 
| 27 #include "chrome/browser/ui/gtk/accelerators_gtk.h" | 27 #include "chrome/browser/ui/gtk/accelerators_gtk.h" | 
| 28 #include "chrome/browser/ui/gtk/back_forward_button_gtk.h" | 28 #include "chrome/browser/ui/gtk/back_forward_button_gtk.h" | 
| 29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h" | 29 #include "chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h" | 
| 30 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h" | 30 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h" | 
| (...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 703                       allocation.x + x_offset, | 703                       allocation.x + x_offset, | 
| 704                       allocation.y + y_offset); | 704                       allocation.y + y_offset); | 
| 705 | 705 | 
| 706   return FALSE; | 706   return FALSE; | 
| 707 } | 707 } | 
| 708 | 708 | 
| 709 void BrowserToolbarGtk::UpdateShowHomeButton() { | 709 void BrowserToolbarGtk::UpdateShowHomeButton() { | 
| 710   bool visible = show_home_button_.GetValue() && !ShouldOnlyShowLocation(); | 710   bool visible = show_home_button_.GetValue() && !ShouldOnlyShowLocation(); | 
| 711   gtk_widget_set_visible(home_->widget(), visible); | 711   gtk_widget_set_visible(home_->widget(), visible); | 
| 712 } | 712 } | 
| OLD | NEW | 
|---|