chrome/browser/ui/views/options/fonts_languages_window_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing 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

« no previous file with comments | « chrome/browser/ui/views/options/exceptions_view.cc ('k') | chrome/browser/ui/views/options/fonts_page_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 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/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/views/options/fonts_page_view.h"	11 #include "chrome/browser/ui/views/options/fonts_page_view.h"

12 #include "chrome/browser/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"	14 #include "chrome/common/pref_names.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/controls/tabbed_pane/tabbed_pane.h"

19 #include "views/window/window.h"	19 #include "views/window/window.h"

20	20

21 // static	21 // static

22 static FontsLanguagesWindowView* instance_ = NULL;	22 static FontsLanguagesWindowView* instance_ = NULL;

(...skipping 104 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
127 // If there's already an existing fonts and language window, activate it and	127 // If there's already an existing fonts and language window, activate it and

128 // switch to the specified page.	128 // switch to the specified page.

129 // 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

130 // about this case this will have to be fixed.	130 // about this case this will have to be fixed.

131 if (!instance_) {	131 if (!instance_) {

132 instance_ = new FontsLanguagesWindowView(profile);	132 instance_ = new FontsLanguagesWindowView(profile);

133 views::Window::CreateChromeWindow(window, gfx::Rect(), instance_);	133 views::Window::CreateChromeWindow(window, gfx::Rect(), instance_);

134 }	134 }

135 instance_->ShowTabPage(page);	135 instance_->ShowTabPage(page);

136 }	136 }

OLD	NEW