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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/win/windows_version.h" | 9 #include "base/win/windows_version.h" |
10 #include "ui/app_list/app_list_constants.h" | 10 #include "ui/app_list/app_list_constants.h" |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 // static | 242 // static |
243 void AppListView::SetNextPaintCallback(void (*callback)()) { | 243 void AppListView::SetNextPaintCallback(void (*callback)()) { |
244 g_next_paint_callback = callback; | 244 g_next_paint_callback = callback; |
245 } | 245 } |
246 | 246 |
247 #if defined(OS_WIN) | 247 #if defined(OS_WIN) |
248 HWND AppListView::GetHWND() const { | 248 HWND AppListView::GetHWND() const { |
249 #if defined(USE_AURA) | 249 #if defined(USE_AURA) |
250 gfx::NativeWindow window = | 250 gfx::NativeWindow window = |
251 GetWidget()->GetTopLevelWidget()->GetNativeWindow(); | 251 GetWidget()->GetTopLevelWidget()->GetNativeWindow(); |
252 return window->GetDispatcher()->host()->GetAcceleratedWidget(); | 252 return window->GetHost()->GetAcceleratedWidget(); |
253 #else | 253 #else |
254 return GetWidget()->GetTopLevelWidget()->GetNativeWindow(); | 254 return GetWidget()->GetTopLevelWidget()->GetNativeWindow(); |
255 #endif | 255 #endif |
256 } | 256 } |
257 #endif | 257 #endif |
258 | 258 |
259 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, | 259 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, |
260 PaginationModel* pagination_model, | 260 PaginationModel* pagination_model, |
261 views::BubbleBorder::Arrow arrow, | 261 views::BubbleBorder::Arrow arrow, |
262 bool border_accepts_events, | 262 bool border_accepts_events, |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
492 #else | 492 #else |
493 speech_view_->SetVisible(recognizing); | 493 speech_view_->SetVisible(recognizing); |
494 app_list_main_view_->SetVisible(!recognizing); | 494 app_list_main_view_->SetVisible(!recognizing); |
495 | 495 |
496 // Needs to schedule paint of AppListView itself, to repaint the background. | 496 // Needs to schedule paint of AppListView itself, to repaint the background. |
497 GetBubbleFrameView()->SchedulePaint(); | 497 GetBubbleFrameView()->SchedulePaint(); |
498 #endif | 498 #endif |
499 } | 499 } |
500 | 500 |
501 } // namespace app_list | 501 } // namespace app_list |
OLD | NEW |