| 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 #include "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/prefs/pref_service.h" | |
| 9 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser_list.h" | 9 #include "chrome/browser/ui/browser_list.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "chrome/browser/ui/options/options_window.h" | 11 #include "chrome/browser/ui/options/options_window.h" |
| 13 #include "chrome/browser/ui/views/options/advanced_page_view.h" | 12 #include "chrome/browser/ui/views/options/advanced_page_view.h" |
| 14 #include "chrome/browser/ui/views/options/content_page_view.h" | 13 #include "chrome/browser/ui/views/options/content_page_view.h" |
| 15 #include "chrome/browser/ui/views/options/general_page_view.h" | 14 #include "chrome/browser/ui/views/options/general_page_view.h" |
| 16 #include "chrome/browser/ui/window_sizer.h" | 15 #include "chrome/browser/ui/window_sizer.h" |
| 17 #include "chrome/common/chrome_constants.h" | 16 #include "chrome/common/chrome_constants.h" |
| 18 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 // If there's already an existing options window, activate it and switch to | 238 // If there's already an existing options window, activate it and switch to |
| 240 // the specified page. | 239 // the specified page. |
| 241 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care | 240 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care |
| 242 // about this case this will have to be fixed. | 241 // about this case this will have to be fixed. |
| 243 if (!instance_) { | 242 if (!instance_) { |
| 244 instance_ = new OptionsWindowView(profile); | 243 instance_ = new OptionsWindowView(profile); |
| 245 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_); | 244 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_); |
| 246 } | 245 } |
| 247 instance_->ShowOptionsPage(page, highlight_group); | 246 instance_->ShowOptionsPage(page, highlight_group); |
| 248 } | 247 } |
| OLD | NEW |