Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/input_method/candidate_window_controller_impl. h" 5 #include "chrome/browser/chromeos/input_method/candidate_window_controller_impl. h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm/window_util.h" 12 #include "ash/wm/window_util.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" 14 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h"
15 #include "ui/base/ime/ime_bridge.h" 15 #include "ui/base/ime/ime_bridge.h"
16 #include "ui/chromeos/ime/infolist_window.h" 16 #include "ui/chromeos/ime/infolist_window.h"
17 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 namespace input_method { 20 namespace input_method {
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 observers_.AddObserver(observer); 191 observers_.AddObserver(observer);
192 } 192 }
193 193
194 void CandidateWindowControllerImpl::RemoveObserver( 194 void CandidateWindowControllerImpl::RemoveObserver(
195 CandidateWindowController::Observer* observer) { 195 CandidateWindowController::Observer* observer) {
196 observers_.RemoveObserver(observer); 196 observers_.RemoveObserver(observer);
197 } 197 }
198 198
199 } // namespace input_method 199 } // namespace input_method
200 } // namespace chromeos 200 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698