chrome/browser/ui/gtk/browser_toolbar_gtk.cc - Issue 6328002: Update references part 1: subdirectories of chrome/browser/ui/gtk/:...

Unified Diff: chrome/browser/ui/gtk/browser_toolbar_gtk.cc

Issue 6328002: Update references part 1: subdirectories of chrome/browser/ui/gtk/:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | chrome/browser/ui/gtk/status_icons/status_tray_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/browser_toolbar_gtk.cc

===================================================================

--- chrome/browser/ui/gtk/browser_toolbar_gtk.cc (revision 71526)

+++ chrome/browser/ui/gtk/browser_toolbar_gtk.cc (working copy)

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/gtk/browser_toolbar_gtk.h"

+#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"

#include <X11/XF86keysym.h>

#include <gdk/gdkkeysyms.h>

@@ -18,20 +18,6 @@

#include "base/singleton.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/background_page_tracker.h"

-#include "chrome/browser/gtk/accelerators_gtk.h"

-#include "chrome/browser/gtk/back_forward_button_gtk.h"

-#include "chrome/browser/gtk/browser_actions_toolbar_gtk.h"

-#include "chrome/browser/gtk/browser_window_gtk.h"

-#include "chrome/browser/gtk/cairo_cached_surface.h"

-#include "chrome/browser/gtk/custom_button.h"

-#include "chrome/browser/gtk/gtk_chrome_button.h"

-#include "chrome/browser/gtk/gtk_theme_provider.h"

-#include "chrome/browser/gtk/gtk_util.h"

-#include "chrome/browser/gtk/location_bar_view_gtk.h"

-#include "chrome/browser/gtk/reload_button_gtk.h"

-#include "chrome/browser/gtk/rounded_window.h"

-#include "chrome/browser/gtk/tabs/tab_strip_gtk.h"

-#include "chrome/browser/gtk/view_id_util.h"

#include "chrome/browser/metrics/user_metrics.h"

#include "chrome/browser/net/url_fixer_upper.h"

#include "chrome/browser/prefs/pref_service.h"

@@ -39,6 +25,20 @@

#include "chrome/browser/tab_contents/tab_contents.h"

#include "chrome/browser/themes/browser_theme_provider.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/browser/ui/gtk/accelerators_gtk.h"

+#include "chrome/browser/ui/gtk/back_forward_button_gtk.h"

+#include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"

+#include "chrome/browser/ui/gtk/browser_window_gtk.h"

+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"

+#include "chrome/browser/ui/gtk/custom_button.h"

+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"

+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"

+#include "chrome/browser/ui/gtk/gtk_util.h"

+#include "chrome/browser/ui/gtk/location_bar_view_gtk.h"

+#include "chrome/browser/ui/gtk/reload_button_gtk.h"

+#include "chrome/browser/ui/gtk/rounded_window.h"

+#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"

+#include "chrome/browser/ui/gtk/view_id_util.h"

#include "chrome/browser/ui/toolbar/encoding_menu_controller.h"

#include "chrome/browser/upgrade_detector.h"

#include "chrome/common/notification_details.h"