chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc - Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

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

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

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

index 90c57564a4d9ff77b22db945d667cf1f2c515e87..14095344f531a100b7cf51878ca46ffb367cc39f 100644

--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

@@ -28,11 +28,11 @@

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

#include "chromeos/chromeos_switches.h"

+#include "chromeos/ime/extension_ime_util.h"

#include "chromeos/network/network_handler.h"

#include "chromeos/network/network_state_handler.h"

#include "components/user_manager/user_manager.h"

#include "content/public/browser/browser_thread.h"

-#include "ui/base/ime/chromeos/extension_ime_util.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/gfx/rect.h"

#include "ui/views/layout/fill_layout.h"