chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc - Issue 150203015: Split out InputMethodMenuManager from InputMethodManager

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/input_method/input_method_engine_browsertests.cc

Issue 150203015: Split out InputMethodMenuManager from InputMethodManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make clang happy Created 6 years, 10 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/extensions/input_method_event_router.h ('K') | « chrome/browser/chromeos/input_method/input_method_engine.cc ('k') | chrome/browser/chromeos/input_method/input_method_manager_impl.h » ('j') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

index 69a602ae25859efe94d871b6f2253a938bf618c0..220836c6f54f999e00150699e6bb29ec1c2cfef2 100644

--- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

+++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

@@ -2,6 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "ash/ime/input_method_menu_item.h"

+#include "ash/ime/input_method_menu_manager.h"

#include "base/bind_helpers.h"

#include "chrome/browser/extensions/extension_browsertest.h"

#include "chrome/browser/extensions/extension_test_message_listener.h"

@@ -786,8 +788,9 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineIBusBrowserTest,

ASSERT_TRUE(content::ExecuteScript(

host->host_contents(), set_menu_item_test_script));

- const InputMethodPropertyList& props =

- InputMethodManager::Get()->GetCurrentInputMethodProperties();

+ const ash::ime::InputMethodMenuItemList& props =

+ ash::ime::InputMethodMenuManager::Get()->

+ GetCurrentInputMethodMenuItemList();

ASSERT_EQ(5U, props.size());

EXPECT_EQ("ID0", props[0].key);