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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_handler.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 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/webui/options/chromeos/virtual_keyboard_manager_hand ler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand ler.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 16 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
17 #include "chrome/browser/chromeos/input_method/input_method_util.h" 17 #include "chrome/browser/chromeos/input_method/input_method_util.h"
18 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h" 18 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
19 #include "chrome/browser/chromeos/preferences.h" 19 #include "chrome/browser/chromeos/preferences.h"
20 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/prefs/scoped_user_pref_update.h" 21 #include "chrome/browser/prefs/scoped_user_pref_update.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/common/chrome_notification_types.h" 23 #include "chrome/common/chrome_notification_types.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "content/browser/webui/web_ui.h"
25 #include "content/public/browser/notification_details.h" 26 #include "content/public/browser/notification_details.h"
26 #include "content/public/browser/notification_source.h" 27 #include "content/public/browser/notification_source.h"
27 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
28 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
29 30
30 namespace ime = ::chromeos::input_method; 31 namespace ime = ::chromeos::input_method;
31 32
32 namespace chromeos { 33 namespace chromeos {
33 34
34 VirtualKeyboardManagerHandler::VirtualKeyboardManagerHandler() { 35 VirtualKeyboardManagerHandler::VirtualKeyboardManagerHandler() {
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 virtual_keyboard->SetString("name", i->second->name()); 226 virtual_keyboard->SetString("name", i->second->name());
226 virtual_keyboard->SetBoolean("isSystem", i->second->is_system()); 227 virtual_keyboard->SetBoolean("isSystem", i->second->is_system());
227 virtual_keyboard->SetString("url", i->second->url().spec()); 228 virtual_keyboard->SetString("url", i->second->url().spec());
228 supported_keyboards->Append(virtual_keyboard); 229 supported_keyboards->Append(virtual_keyboard);
229 } 230 }
230 231
231 return layout_list; 232 return layout_list;
232 } 233 }
233 234
234 } // namespace chromeos 235 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698