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

Unified Diff: chrome/browser/gtk/options/fonts_page_gtk.h

Issue 6099014: Move chrome/browser/gtk to chrome/browser/ui/gtk (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Move browser/gtk/ to browser/ui/gtk/, leave header stubs, update new header guards 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/gtk/options/cookies_view.h ('k') | chrome/browser/gtk/options/general_page_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/fonts_page_gtk.h
diff --git a/chrome/browser/gtk/options/fonts_page_gtk.h b/chrome/browser/gtk/options/fonts_page_gtk.h
index 3dbdf5ab17fe0a47ca1bac212759e0df13e24088..9b6f02935f08751194e6c5e5cfa389056e265493 100644
--- a/chrome/browser/gtk/options/fonts_page_gtk.h
+++ b/chrome/browser/gtk/options/fonts_page_gtk.h
@@ -1,75 +1,12 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// The fonts page of the fonts & languages options dialog, which contains font
-// family and size settings, as well as the default encoding option.
-
#ifndef CHROME_BROWSER_GTK_OPTIONS_FONTS_PAGE_GTK_H_
#define CHROME_BROWSER_GTK_OPTIONS_FONTS_PAGE_GTK_H_
#pragma once
-#include <gtk/gtk.h>
-
-#include "app/gtk_signal.h"
-#include "base/scoped_ptr.h"
-#include "chrome/browser/character_encoding.h"
-#include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/ui/options/options_page_base.h"
-
-class DefaultEncodingComboboxModel;
-
-class FontsPageGtk : public OptionsPageBase {
- public:
- explicit FontsPageGtk(Profile* profile);
- virtual ~FontsPageGtk();
-
- GtkWidget* get_page_widget() const { return page_; }
-
- private:
- void Init();
- void InitDefaultEncodingComboBox();
-
- // Overridden from OptionsPageBase.
- virtual void NotifyPrefChanged(const std::string* pref_name);
-
- // Retrieve the font selection from the button and save it to the prefs. Also
- // ensure the button(s) are displayed in the proper size, as the
- // GtkFontSelector returns the value in points not pixels.
- void SetFontsFromButton(StringPrefMember* name_pref,
- IntegerPrefMember* size_pref,
- GtkWidget* font_button);
-
- CHROMEGTK_CALLBACK_0(FontsPageGtk, void, OnSerifFontSet);
- CHROMEGTK_CALLBACK_0(FontsPageGtk, void, OnSansFontSet);
- CHROMEGTK_CALLBACK_0(FontsPageGtk, void, OnFixedFontSet);
- CHROMEGTK_CALLBACK_0(FontsPageGtk, void, OnDefaultEncodingChanged);
-
- // The font chooser widgets
- GtkWidget* serif_font_button_;
- GtkWidget* sans_font_button_;
- GtkWidget* fixed_font_button_;
-
- // The default encoding combobox widget.
- GtkWidget* default_encoding_combobox_;
- scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;
-
- // The widget containing the options for this page.
- GtkWidget* page_;
-
- // Font name preferences.
- StringPrefMember serif_name_;
- StringPrefMember sans_serif_name_;
- StringPrefMember fixed_width_name_;
-
- // Font size preferences, in pixels.
- IntegerPrefMember variable_width_size_;
- IntegerPrefMember fixed_width_size_;
-
- // Default encoding preference.
- StringPrefMember default_encoding_;
-
- DISALLOW_COPY_AND_ASSIGN(FontsPageGtk);
-};
+#include "chrome/browser/ui/gtk/options/fonts_page_gtk.h"
+// TODO(msw): remove this file once all includes have been updated.
#endif // CHROME_BROWSER_GTK_OPTIONS_FONTS_PAGE_GTK_H_
« no previous file with comments | « chrome/browser/gtk/options/cookies_view.h ('k') | chrome/browser/gtk/options/general_page_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698