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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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/chromeos/login/network_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/cros/cros_library.h" 13 #include "chrome/browser/chromeos/cros/cros_library.h"
14 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 14 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
15 #include "chrome/browser/chromeos/input_method/input_method_util.h" 15 #include "chrome/browser/chromeos/input_method/input_method_util.h"
16 #include "chrome/browser/chromeos/login/language_switch_menu.h" 16 #include "chrome/browser/chromeos/login/language_switch_menu.h"
17 #include "chrome/browser/chromeos/status/input_method_menu.h" 17 #include "chrome/browser/chromeos/status/input_method_menu.h"
18 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 18 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
19 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 19 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
20 #include "content/browser/tab_contents/tab_contents.h" 20 #include "content/browser/tab_contents/tab_contents.h"
21 #include "content/browser/webui/web_ui.h" 21 #include "content/browser/webui/web_ui.h"
22 #include "content/browser/webui/web_ui.h" 22 #include "content/browser/webui/web_ui.h"
23 #include "grit/chromium_strings.h" 23 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 24 #include "grit/generated_resources.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/gfx/rect.h" 26 #include "ui/gfx/rect.h"
27 #include "ui/views/layout/fill_layout.h" 27 #include "ui/views/layout/fill_layout.h"
28 #include "ui/views/widget/widget.h" 28 #include "views/widget/widget.h"
29 29
30 #if defined(TOOLKIT_USES_GTK) 30 #if defined(TOOLKIT_USES_GTK)
31 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" 31 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
32 #endif 32 #endif
33 33
34 namespace { 34 namespace {
35 35
36 // Network screen id. 36 // Network screen id.
37 const char kNetworkScreen[] = "connect"; 37 const char kNetworkScreen[] = "connect";
38 38
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 input_method->SetString( 228 input_method->SetString(
229 "title", InputMethodMenu::GetTextForMenu(input_methods->at(i))); 229 "title", InputMethodMenu::GetTextForMenu(input_methods->at(i)));
230 input_method->SetBoolean("selected", 230 input_method->SetBoolean("selected",
231 input_methods->at(i).id() == current_input_method_id); 231 input_methods->at(i).id() == current_input_method_id);
232 input_methods_list->Append(input_method); 232 input_methods_list->Append(input_method);
233 } 233 }
234 return input_methods_list; 234 return input_methods_list;
235 } 235 }
236 236
237 } // namespace chromeos 237 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698