Chromium Code Reviews

Side by Side Diff: chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc

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.
Jump to:
View unified diff | | Annotate | Revision Log
Property Changes:
Added: svn:eol-style
+ LF
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/dom_ui/language_customize_modifier_keys_handle r.h" 5 #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handle r.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "cros/chromeos_keyboard.h"
10 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "third_party/cros/chromeos_keyboard.h"
11 11
12 namespace { 12 namespace {
13 const struct ModifierKeysSelectItem { 13 const struct ModifierKeysSelectItem {
14 int message_id; 14 int message_id;
15 chromeos::ModifierKey value; 15 chromeos::ModifierKey value;
16 } kModifierKeysSelectItems[] = { 16 } kModifierKeysSelectItems[] = {
17 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_SEARCH_LABEL, 17 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_SEARCH_LABEL,
18 chromeos::kSearchKey }, 18 chromeos::kSearchKey },
19 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_LEFT_CTRL, 19 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_LEFT_CTRL,
20 chromeos::kLeftControlKey }, 20 chromeos::kLeftControlKey },
(...skipping 48 matching lines...)
69 option->Append(Value::CreateIntegerValue(value)); 69 option->Append(Value::CreateIntegerValue(value));
70 option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16( 70 option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
71 message_id))); 71 message_id)));
72 list_value->Append(option); 72 list_value->Append(option);
73 } 73 }
74 localized_strings->Set(kDataValuesNames[i], list_value); 74 localized_strings->Set(kDataValuesNames[i], list_value);
75 } 75 }
76 } 76 }
77 77
78 } // namespace chromeos 78 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc ('k') | chrome/browser/chromeos/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine