OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/options/fonts_languages_window_view.h" | 5 #include "chrome/browser/views/options/fonts_languages_window_view.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profile.h" |
10 #include "chrome/browser/views/options/fonts_page_view.h" | 10 #include "chrome/browser/views/options/fonts_page_view.h" |
11 #include "chrome/browser/views/options/languages_page_view.h" | 11 #include "chrome/browser/views/options/languages_page_view.h" |
12 #include "chrome/common/chrome_constants.h" | 12 #include "chrome/common/chrome_constants.h" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
14 #include "chrome/common/pref_service.h" | 14 #include "chrome/common/pref_service.h" |
15 #include "grit/chromium_strings.h" | 15 #include "grit/chromium_strings.h" |
16 #include "grit/generated_resources.h" | 16 #include "grit/generated_resources.h" |
17 #include "grit/locale_settings.h" | 17 #include "grit/locale_settings.h" |
| 18 #include "views/controls/tabbed_pane/tabbed_pane.h" |
18 #include "views/window/window.h" | 19 #include "views/window/window.h" |
19 | 20 |
20 // static | 21 // static |
21 static FontsLanguagesWindowView* instance_ = NULL; | 22 static FontsLanguagesWindowView* instance_ = NULL; |
22 static const int kDialogPadding = 7; | 23 static const int kDialogPadding = 7; |
23 | 24 |
24 /////////////////////////////////////////////////////////////////////////////// | 25 /////////////////////////////////////////////////////////////////////////////// |
25 // FontsLanguagesWindowView, public: | 26 // FontsLanguagesWindowView, public: |
26 | 27 |
27 FontsLanguagesWindowView::FontsLanguagesWindowView(Profile* profile) | 28 FontsLanguagesWindowView::FontsLanguagesWindowView(Profile* profile) |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 // switch to the specified page. | 128 // switch to the specified page. |
128 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care | 129 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care |
129 // about this case this will have to be fixed. | 130 // about this case this will have to be fixed. |
130 if (!instance_) { | 131 if (!instance_) { |
131 instance_ = new FontsLanguagesWindowView(profile); | 132 instance_ = new FontsLanguagesWindowView(profile); |
132 views::Window::CreateChromeWindow(window, gfx::Rect(), instance_); | 133 views::Window::CreateChromeWindow(window, gfx::Rect(), instance_); |
133 // The window is alive by itself now... | 134 // The window is alive by itself now... |
134 } | 135 } |
135 instance_->ShowTabPage(page); | 136 instance_->ShowTabPage(page); |
136 } | 137 } |
OLD | NEW |