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

Side by Side Diff: chrome/browser/ui/views/options/fonts_languages_window_view.cc

Issue 6122006: Cleanup: Remove unneeded includes of pref_names.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/views/options/fonts_languages_window_view.h" 5 #include "chrome/browser/ui/views/options/fonts_languages_window_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/views/options/fonts_page_view.h" 11 #include "chrome/browser/ui/views/options/fonts_page_view.h"
12 #include "chrome/browser/ui/views/options/languages_page_view.h" 12 #include "chrome/browser/ui/views/options/languages_page_view.h"
13 #include "chrome/common/chrome_constants.h" 13 #include "chrome/common/chrome_constants.h"
14 #include "chrome/common/pref_names.h"
15 #include "grit/chromium_strings.h" 14 #include "grit/chromium_strings.h"
16 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
17 #include "grit/locale_settings.h" 16 #include "grit/locale_settings.h"
18 #include "views/controls/tabbed_pane/tabbed_pane.h" 17 #include "views/controls/tabbed_pane/tabbed_pane.h"
19 #include "views/window/window.h" 18 #include "views/window/window.h"
20 19
21 // static 20 // static
22 static FontsLanguagesWindowView* instance_ = NULL; 21 static FontsLanguagesWindowView* instance_ = NULL;
23 static const int kDialogPadding = 7; 22 static const int kDialogPadding = 7;
24 23
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // If there's already an existing fonts and language window, activate it and 126 // If there's already an existing fonts and language window, activate it and
128 // switch to the specified page. 127 // switch to the specified page.
129 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care 128 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care
130 // about this case this will have to be fixed. 129 // about this case this will have to be fixed.
131 if (!instance_) { 130 if (!instance_) {
132 instance_ = new FontsLanguagesWindowView(profile); 131 instance_ = new FontsLanguagesWindowView(profile);
133 views::Window::CreateChromeWindow(window, gfx::Rect(), instance_); 132 views::Window::CreateChromeWindow(window, gfx::Rect(), instance_);
134 } 133 }
135 instance_->ShowTabPage(page); 134 instance_->ShowTabPage(page);
136 } 135 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/instant_confirm_view.cc ('k') | chrome/browser/ui/views/tabs/tab_dragging_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698