chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc - Issue 224113005: Eliminate ash::internal namespace

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/candidate_window_controller_impl.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/display/overscan_calibrator.cc ('k') | chrome/browser/chromeos/input_method/mode_indicator_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f2721a9bb974eff3a50de90b87dae4a629800c65..5cdb9b2d2ce247838d927b59ac834a1b9346f9b0 100644

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

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

@@ -47,9 +47,9 @@ void CandidateWindowControllerImpl::InitCandidateWindowView() {

aura::Window* active_window = ash::wm::GetActiveWindow();

candidate_window_view_ =

new ash::ime::CandidateWindowView(ash::Shell::GetContainer(

- active_window ?

- active_window->GetRootWindow() : ash::Shell::GetTargetRootWindow(),

- ash::internal::kShellWindowId_InputMethodContainer));

+ active_window ? active_window->GetRootWindow()

+ : ash::Shell::GetTargetRootWindow(),

+ ash::kShellWindowId_InputMethodContainer));

candidate_window_view_->AddObserver(this);

candidate_window_view_->SetCursorBounds(cursor_bounds_, composition_head_);

views::Widget* widget = candidate_window_view_->InitWidget();