chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/stringprintf.h"	7 #include "base/stringprintf.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "base/values.h"	9 #include "base/values.h"

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

11 #include "chrome/browser/chromeos/cros/cros_library.h"	11 #include "chrome/browser/chromeos/cros/cros_library.h"

12 #include "chrome/browser/chromeos/input_method/input_method_util.h"	12 #include "chrome/browser/chromeos/input_method/input_method_util.h"

13 #include "chrome/browser/chromeos/login/language_switch_menu.h"	13 #include "chrome/browser/chromeos/login/language_switch_menu.h"

14 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	14 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

15 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"	15 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"

16 #include "chromeos/ime/input_method_manager.h"	16 #include "chromeos/ime/input_method_manager.h"

17 #include "grit/chromium_strings.h"	17 #include "grit/chromium_strings.h"

18 #include "grit/generated_resources.h"	18 #include "grit/generated_resources.h"

(...skipping 187 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
206 "title",	206 "title",

207 util->GetInputMethodLongName(input_methods->at(i)));	207 util->GetInputMethodLongName(input_methods->at(i)));

208 input_method->SetBoolean("selected",	208 input_method->SetBoolean("selected",

209 ime_id == current_input_method_id);	209 ime_id == current_input_method_id);

210 input_methods_list->Append(input_method);	210 input_methods_list->Append(input_method);

211 }	211 }

212 return input_methods_list;	212 return input_methods_list;

213 }	213 }

214	214

215 } // namespace chromeos	215 } // namespace chromeos

OLD	NEW