OLD | NEW |
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 "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); | 98 views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); |
99 #endif // USE_ASH | 99 #endif // USE_ASH |
100 | 100 |
101 InfolistWindowView* infolist_view = new InfolistWindowView; | 101 InfolistWindowView* infolist_view = new InfolistWindowView; |
102 infolist_view->Init(); | 102 infolist_view->Init(); |
103 infolist_window_->SetContentsView(infolist_view); | 103 infolist_window_->SetContentsView(infolist_view); |
104 } | 104 } |
105 | 105 |
106 CandidateWindowControllerImpl::CandidateWindowControllerImpl() | 106 CandidateWindowControllerImpl::CandidateWindowControllerImpl() |
107 : candidate_window_(NULL), | 107 : candidate_window_(NULL), |
108 infolist_window_(NULL), | 108 latest_infolist_focused_index_(InfolistWindowView::InvalidFocusIndex()) {} |
109 latest_infolist_focused_index_(InfolistWindowView::InvalidFocusIndex()) { | |
110 } | |
111 | 109 |
112 CandidateWindowControllerImpl::~CandidateWindowControllerImpl() { | 110 CandidateWindowControllerImpl::~CandidateWindowControllerImpl() { |
113 if (DBusThreadManager::Get()->GetIBusPanelService()) | 111 if (DBusThreadManager::Get()->GetIBusPanelService()) |
114 DBusThreadManager::Get()->GetIBusPanelService()-> | 112 DBusThreadManager::Get()->GetIBusPanelService()-> |
115 SetUpCandidateWindowHandler(NULL); | 113 SetUpCandidateWindowHandler(NULL); |
116 candidate_window_->RemoveObserver(this); | 114 candidate_window_->RemoveObserver(this); |
117 } | 115 } |
118 | 116 |
119 void CandidateWindowControllerImpl::HideAuxiliaryText() { | 117 void CandidateWindowControllerImpl::HideAuxiliaryText() { |
120 candidate_window_->HideAuxiliaryText(); | 118 candidate_window_->HideAuxiliaryText(); |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 | 351 |
354 if (candidate_window_rect.y() + infolist_window_size.height() > | 352 if (candidate_window_rect.y() + infolist_window_size.height() > |
355 screen_rect.bottom()) | 353 screen_rect.bottom()) |
356 result.set_y(screen_rect.bottom() - infolist_window_size.height()); | 354 result.set_y(screen_rect.bottom() - infolist_window_size.height()); |
357 | 355 |
358 return result; | 356 return result; |
359 } | 357 } |
360 | 358 |
361 } // namespace input_method | 359 } // namespace input_method |
362 } // namespace chromeos | 360 } // namespace chromeos |
OLD | NEW |