Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: chrome/browser/gtk/options/content_settings_window_gtk.h

Issue 2757005: Gtk: Change content settings window to use a list instead of tabs. (Closed)
Patch Set: comments Created 10 years, 5 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
OLDNEW
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_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_
6 #define CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include "app/gtk_signal.h" 10 #include "app/gtk_signal.h"
(...skipping 18 matching lines...) Expand all
29 explicit ContentSettingsWindowGtk(GtkWindow* parent, Profile* profile); 29 explicit ContentSettingsWindowGtk(GtkWindow* parent, Profile* profile);
30 virtual ~ContentSettingsWindowGtk(); 30 virtual ~ContentSettingsWindowGtk();
31 31
32 private: 32 private:
33 // Shows the Tab corresponding to the specified Content Settings page. 33 // Shows the Tab corresponding to the specified Content Settings page.
34 void ShowContentSettingsTab(ContentSettingsType page); 34 void ShowContentSettingsTab(ContentSettingsType page);
35 35
36 CHROMEGTK_CALLBACK_2(ContentSettingsWindowGtk, void, OnSwitchPage, 36 CHROMEGTK_CALLBACK_2(ContentSettingsWindowGtk, void, OnSwitchPage,
37 GtkNotebookPage*, guint); 37 GtkNotebookPage*, guint);
38 CHROMEGTK_CALLBACK_0(ContentSettingsWindowGtk, void, OnWindowDestroy); 38 CHROMEGTK_CALLBACK_0(ContentSettingsWindowGtk, void, OnWindowDestroy);
39 CHROMEG_CALLBACK_0(ContentSettingsWindowGtk, void, OnListSelectionChanged,
40 GtkTreeSelection*);
39 41
40 // The options dialog. 42 // The options dialog.
41 GtkWidget* dialog_; 43 GtkWidget* dialog_;
42 44
43 // The container of the option pages. 45 // The container of the option pages.
44 GtkWidget* notebook_; 46 GtkWidget* notebook_;
47 GtkWidget* list_;
45 48
46 // The Profile associated with these options. 49 // The Profile associated with these options.
47 Profile* profile_; 50 Profile* profile_;
48 51
49 // The last page the user was on when they opened the ContentSettings window. 52 // The last page the user was on when they opened the ContentSettings window.
50 IntegerPrefMember last_selected_page_; 53 IntegerPrefMember last_selected_page_;
51 54
52 // The individual page implementations. Note that we have a specialized one 55 // The individual page implementations. Note that we have a specialized one
53 // for cookies (which have more complex rules) and use the same basic page 56 // for cookies (which have more complex rules) and use the same basic page
54 // layout for each other type. 57 // layout for each other type.
55 CookieFilterPageGtk cookie_page_; 58 CookieFilterPageGtk cookie_page_;
56 ContentFilterPageGtk image_page_; 59 ContentFilterPageGtk image_page_;
57 ContentFilterPageGtk javascript_page_; 60 ContentFilterPageGtk javascript_page_;
58 ContentFilterPageGtk plugin_page_; 61 ContentFilterPageGtk plugin_page_;
59 ContentFilterPageGtk popup_page_; 62 ContentFilterPageGtk popup_page_;
60 ContentFilterPageGtk geolocation_page_; 63 ContentFilterPageGtk geolocation_page_;
61 ContentFilterPageGtk notifications_page_; 64 ContentFilterPageGtk notifications_page_;
62 65
63 // Helper object to manage accessibility metadata. 66 // Helper object to manage accessibility metadata.
64 scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_; 67 scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
65 68
66 DISALLOW_COPY_AND_ASSIGN(ContentSettingsWindowGtk); 69 DISALLOW_COPY_AND_ASSIGN(ContentSettingsWindowGtk);
67 }; 70 };
68 71
69 #endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_ 72 #endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698