chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 727143002: 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/ash/system_tray_delegate_chromeos.cc

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

Patch Set: add ui/chromeos/ime/DEPS 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/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.h » ('j') | chromeos/chromeos.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 0cb04f7d9fb47866d6d433c4747549ab058ba553..b8d58764d1e2a2e2bf3dfd0e7ada50ad36484f56 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -89,9 +89,6 @@

#include "chrome/grit/locale_settings.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

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

-#include "chromeos/ime/ime_keyboard.h"

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

#include "chromeos/login/login_state.h"

#include "chromeos/network/portal_detector/network_portal_detector.h"

#include "components/google/core/browser/google_util.h"

@@ -110,8 +107,11 @@

#include "third_party/cros_system_api/dbus/service_constants.h"

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

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

-#include "ui/chromeos/ime/input_method_menu_item.h"

-#include "ui/chromeos/ime/input_method_menu_manager.h"

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

+#include "ui/chromeos/ime/ime_keyboard.h"

+#include "ui/chromeos/ime/input_method_manager.h"

+#include "ui/chromeos/ime/view/input_method_menu_item.h"

+#include "ui/chromeos/ime/view/input_method_menu_manager.h"

namespace chromeos {

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.h » ('j') | chromeos/chromeos.gyp » ('J')