chrome/browser/gtk/browser_toolbar_gtk.h - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/gtk/browser_toolbar_gtk.h

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/gtk/browser_titlebar.cc ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_	5 #ifndef CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_

6 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_	6 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_

7 #pragma once	7 #pragma once

8	8

9 #include <gtk/gtk.h>	9 #include <gtk/gtk.h>

10 #include <string>	10 #include <string>

11	11

12 #include "app/active_window_watcher_x.h"	12 #include "app/active_window_watcher_x.h"

13 #include "app/gtk_signal.h"	13 #include "app/gtk_signal.h"

14 #include "app/gtk_signal_registrar.h"	14 #include "app/gtk_signal_registrar.h"

15 #include "app/menus/simple_menu_model.h"	15 #include "app/menus/simple_menu_model.h"

16 #include "app/throb_animation.h"	16 #include "app/throb_animation.h"

17 #include "base/scoped_ptr.h"	17 #include "base/scoped_ptr.h"

18 #include "chrome/browser/command_updater.h"	18 #include "chrome/browser/command_updater.h"

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

20 #include "chrome/browser/gtk/menu_gtk.h"	20 #include "chrome/browser/gtk/menu_gtk.h"

21 #include "chrome/browser/gtk/owned_widget_gtk.h"	21 #include "chrome/browser/gtk/owned_widget_gtk.h"

22 #include "chrome/browser/pref_member.h"	22 #include "chrome/browser/prefs/pref_member.h"

23 #include "chrome/browser/wrench_menu_model.h"	23 #include "chrome/browser/wrench_menu_model.h"

24 #include "chrome/common/notification_observer.h"	24 #include "chrome/common/notification_observer.h"

25 #include "chrome/common/notification_registrar.h"	25 #include "chrome/common/notification_registrar.h"

26	26

27 class BackForwardButtonGtk;	27 class BackForwardButtonGtk;

28 class Browser;	28 class Browser;

29 class BrowserActionsToolbarGtk;	29 class BrowserActionsToolbarGtk;

30 class BrowserWindowGtk;	30 class BrowserWindowGtk;

31 class CustomDrawButton;	31 class CustomDrawButton;

32 class GtkThemeProvider;	32 class GtkThemeProvider;

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
235	235

236 ThrobAnimation upgrade_reminder_animation_;	236 ThrobAnimation upgrade_reminder_animation_;

237	237

238 // We have already shown and dismissed the upgrade reminder animation.	238 // We have already shown and dismissed the upgrade reminder animation.

239 bool upgrade_reminder_canceled_;	239 bool upgrade_reminder_canceled_;

240	240

241 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);	241 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);

242 };	242 };

243	243

244 #endif // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_	244 #endif // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_

OLD	NEW