| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/ime/infolist_window.h" | 5 #include "ash/ime/infolist_window.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ime/candidate_window_constants.h" | 10 #include "ash/ime/candidate_window_constants.h" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 entries[i], title_font_list_, description_font_list_)); | 204 entries[i], title_font_list_, description_font_list_)); |
| 205 AddChildView(entry_views_.back()); | 205 AddChildView(entry_views_.back()); |
| 206 } | 206 } |
| 207 } | 207 } |
| 208 | 208 |
| 209 InfolistWindow::~InfolistWindow() { | 209 InfolistWindow::~InfolistWindow() { |
| 210 } | 210 } |
| 211 | 211 |
| 212 void InfolistWindow::InitWidget() { | 212 void InfolistWindow::InitWidget() { |
| 213 views::Widget* widget = views::BubbleDelegateView::CreateBubble(this); | 213 views::Widget* widget = views::BubbleDelegateView::CreateBubble(this); |
| 214 views::corewm::SetWindowVisibilityAnimationType( | 214 wm::SetWindowVisibilityAnimationType( |
| 215 widget->GetNativeView(), | 215 widget->GetNativeView(), |
| 216 views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); | 216 wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); |
| 217 | 217 |
| 218 // BubbleFrameView will be initialized through CreateBubble. | 218 // BubbleFrameView will be initialized through CreateBubble. |
| 219 GetBubbleFrameView()->SetBubbleBorder( | 219 GetBubbleFrameView()->SetBubbleBorder( |
| 220 scoped_ptr<views::BubbleBorder>(new InfolistBorder())); | 220 scoped_ptr<views::BubbleBorder>(new InfolistBorder())); |
| 221 SizeToContents(); | 221 SizeToContents(); |
| 222 } | 222 } |
| 223 | 223 |
| 224 void InfolistWindow::Relayout(const std::vector<ui::InfolistEntry>& entries) { | 224 void InfolistWindow::Relayout(const std::vector<ui::InfolistEntry>& entries) { |
| 225 size_t i = 0; | 225 size_t i = 0; |
| 226 for (; i < entries.size(); ++i) { | 226 for (; i < entries.size(); ++i) { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 show_hide_timer_.Stop(); | 270 show_hide_timer_.Stop(); |
| 271 GetWidget()->Close(); | 271 GetWidget()->Close(); |
| 272 } | 272 } |
| 273 | 273 |
| 274 void InfolistWindow::WindowClosing() { | 274 void InfolistWindow::WindowClosing() { |
| 275 show_hide_timer_.Stop(); | 275 show_hide_timer_.Stop(); |
| 276 } | 276 } |
| 277 | 277 |
| 278 } // namespace ime | 278 } // namespace ime |
| 279 } // namespace ash | 279 } // namespace ash |
| OLD | NEW |