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

Side by Side Diff: chrome/browser/chromeos/options/language_config_view.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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) 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 "chrome/browser/chromeos/options/language_config_view.h" 5 #include "chrome/browser/chromeos/options/language_config_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "app/gfx/font.h"
12 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chromeos/cros/language_library.h" 14 #include "chrome/browser/chromeos/cros/language_library.h"
16 #include "chrome/browser/chromeos/options/language_hangul_config_view.h" 15 #include "chrome/browser/chromeos/options/language_hangul_config_view.h"
17 #include "chrome/browser/language_combobox_model.h" 16 #include "chrome/browser/language_combobox_model.h"
17 #include "gfx/font.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "grit/locale_settings.h" 19 #include "grit/locale_settings.h"
20 #include "views/controls/combobox/combobox.h" 20 #include "views/controls/combobox/combobox.h"
21 #include "views/controls/label.h" 21 #include "views/controls/label.h"
22 #include "views/fill_layout.h" 22 #include "views/fill_layout.h"
23 #include "views/grid_layout.h" 23 #include "views/grid_layout.h"
24 #include "views/standard_layout.h" 24 #include "views/standard_layout.h"
25 #include "views/window/window.h" 25 #include "views/window/window.h"
26 26
27 namespace chromeos { 27 namespace chromeos {
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 LanguageLibrary::Get()->DeactivateLanguage(language.category, 418 LanguageLibrary::Get()->DeactivateLanguage(language.category,
419 language.id); 419 language.id);
420 } 420 }
421 } 421 }
422 // Switch back to the US English. 422 // Switch back to the US English.
423 LanguageLibrary::Get()->ChangeLanguage( 423 LanguageLibrary::Get()->ChangeLanguage(
424 chromeos::LANGUAGE_CATEGORY_XKB, "USA"); 424 chromeos::LANGUAGE_CATEGORY_XKB, "USA");
425 } 425 }
426 426
427 } // namespace chromeos 427 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/notifications/notification_panel.cc ('k') | chrome/browser/chromeos/panels/panel_scroller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698