chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime

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/chromeos/chrome_browser_main_chromeos.cc

Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index 2afef4e725caa515c784ec92a1d59500c7c004fa..ee520300ef720d58be3e8fcc58b6439cf7e006b3 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -38,7 +38,6 @@

#include "chrome/browser/chromeos/imageburner/burn_manager.h"

#include "chrome/browser/chromeos/input_method/input_method_configuration.h"

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

-#include "chrome/browser/chromeos/input_method/xkeyboard.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

@@ -93,6 +92,7 @@

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

#include "chromeos/disks/disk_mount_manager.h"

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

#include "chromeos/network/geolocation_handler.h"

#include "chromeos/network/network_change_notifier_chromeos.h"

#include "chromeos/network/network_change_notifier_factory_chromeos.h"

« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_manager_impl.cc » ('j') | no next file with comments »