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 "ui/app_list/views/app_list_view.h" | 5 #include "ui/app_list/views/app_list_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 } | 314 } |
315 #endif | 315 #endif |
316 | 316 |
317 PaginationModel* AppListView::GetAppsPaginationModel() { | 317 PaginationModel* AppListView::GetAppsPaginationModel() { |
318 return app_list_main_view_->contents_view() | 318 return app_list_main_view_->contents_view() |
319 ->apps_container_view() | 319 ->apps_container_view() |
320 ->apps_grid_view() | 320 ->apps_grid_view() |
321 ->pagination_model(); | 321 ->pagination_model(); |
322 } | 322 } |
323 | 323 |
| 324 web_modal::ModalDialogHost* AppListView::GetDialogHost() { |
| 325 return app_list_main_view_->contents_view(); |
| 326 } |
| 327 |
324 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, | 328 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, |
325 int initial_apps_page, | 329 int initial_apps_page, |
326 views::BubbleBorder::Arrow arrow, | 330 views::BubbleBorder::Arrow arrow, |
327 bool border_accepts_events, | 331 bool border_accepts_events, |
328 const gfx::Vector2d& anchor_offset) { | 332 const gfx::Vector2d& anchor_offset) { |
329 base::Time start_time = base::Time::Now(); | 333 base::Time start_time = base::Time::Now(); |
330 | 334 |
331 app_list_main_view_ = new AppListMainView(delegate_); | 335 app_list_main_view_ = new AppListMainView(delegate_); |
332 AddChildView(app_list_main_view_); | 336 AddChildView(app_list_main_view_); |
333 app_list_main_view_->SetPaintToLayer(true); | 337 app_list_main_view_->SetPaintToLayer(true); |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 speech_view_->layer()->SetTransform(speech_transform); | 610 speech_view_->layer()->SetTransform(speech_transform); |
607 } | 611 } |
608 | 612 |
609 if (will_appear) | 613 if (will_appear) |
610 speech_view_->SetVisible(true); | 614 speech_view_->SetVisible(true); |
611 else | 615 else |
612 app_list_main_view_->SetVisible(true); | 616 app_list_main_view_->SetVisible(true); |
613 } | 617 } |
614 | 618 |
615 } // namespace app_list | 619 } // namespace app_list |
OLD | NEW |