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

Side by Side Diff: chrome/browser/chromeos/options/language_config_model.h

Issue 5854003: Remove CrOS hack from ppapi.gyp that made the include directories work. This... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "chrome/browser/language_combobox_model.h" 14 #include "chrome/browser/language_combobox_model.h"
15 #include "chrome/browser/prefs/pref_member.h" 15 #include "chrome/browser/prefs/pref_member.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "cros/chromeos_input_method.h" 17 #include "third_party/cros/chromeos_input_method.h"
18 18
19 class Profile; 19 class Profile;
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 // The combobox model is used for adding languages in the language config 23 // The combobox model is used for adding languages in the language config
24 // view. 24 // view.
25 class AddLanguageComboboxModel : public ::LanguageComboboxModel { 25 class AddLanguageComboboxModel : public ::LanguageComboboxModel {
26 public: 26 public:
27 AddLanguageComboboxModel(Profile* profile, 27 AddLanguageComboboxModel(Profile* profile,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 std::vector<std::string> supported_language_codes_; 139 std::vector<std::string> supported_language_codes_;
140 // List of supported IME IDs like "pinyin" and "m17n:ar:kbd". 140 // List of supported IME IDs like "pinyin" and "m17n:ar:kbd".
141 std::vector<std::string> supported_input_method_ids_; 141 std::vector<std::string> supported_input_method_ids_;
142 142
143 DISALLOW_COPY_AND_ASSIGN(LanguageConfigModel); 143 DISALLOW_COPY_AND_ASSIGN(LanguageConfigModel);
144 }; 144 };
145 145
146 } // namespace chromeos 146 } // namespace chromeos
147 147
148 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_ 148 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/notifications/notification_panel.cc ('k') | chrome/browser/chromeos/panels/panel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698