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/options_window.h" | 5 #include "chrome/browser/options_window.h" |
6 | 6 |
| 7 #include "app/l10n_util.h" |
7 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
8 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/profile.h" | 10 #include "chrome/browser/profile.h" |
10 #include "chrome/browser/views/options/advanced_page_view.h" | 11 #include "chrome/browser/views/options/advanced_page_view.h" |
11 #include "chrome/browser/views/options/content_page_view.h" | 12 #include "chrome/browser/views/options/content_page_view.h" |
12 #include "chrome/browser/views/options/general_page_view.h" | 13 #include "chrome/browser/views/options/general_page_view.h" |
13 #include "chrome/common/chrome_constants.h" | 14 #include "chrome/common/chrome_constants.h" |
14 #include "chrome/common/l10n_util.h" | |
15 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
16 #include "chrome/common/pref_service.h" | 16 #include "chrome/common/pref_service.h" |
17 #ifdef CHROME_PERSONALIZATION | 17 #ifdef CHROME_PERSONALIZATION |
18 #include "chrome/personalization/personalization.h" | 18 #include "chrome/personalization/personalization.h" |
19 #include "chrome/personalization/views/user_data_page_view.h" | 19 #include "chrome/personalization/views/user_data_page_view.h" |
20 #endif | 20 #endif |
21 #include "chrome/views/controls/tabbed_pane.h" | 21 #include "chrome/views/controls/tabbed_pane.h" |
22 #include "chrome/views/widget/root_view.h" | 22 #include "chrome/views/widget/root_view.h" |
23 #include "chrome/views/window/dialog_delegate.h" | 23 #include "chrome/views/window/dialog_delegate.h" |
24 #include "chrome/views/window/window.h" | 24 #include "chrome/views/window/window.h" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 // the specified page. | 236 // the specified page. |
237 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care | 237 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care |
238 // about this case this will have to be fixed. | 238 // about this case this will have to be fixed. |
239 if (!instance_) { | 239 if (!instance_) { |
240 instance_ = new OptionsWindowView(profile); | 240 instance_ = new OptionsWindowView(profile); |
241 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_); | 241 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_); |
242 // The window is alive by itself now... | 242 // The window is alive by itself now... |
243 } | 243 } |
244 instance_->ShowOptionsPage(page, highlight_group); | 244 instance_->ShowOptionsPage(page, highlight_group); |
245 } | 245 } |
OLD | NEW |