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/callback.h" | 7 #include "base/callback.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "ui/app_list/app_list_constants.h" | 10 #include "ui/app_list/app_list_constants.h" |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 // static | 180 // static |
181 void AppListView::SetNextPaintCallback(const base::Closure& callback) { | 181 void AppListView::SetNextPaintCallback(const base::Closure& callback) { |
182 g_next_paint_callback = callback; | 182 g_next_paint_callback = callback; |
183 } | 183 } |
184 | 184 |
185 #if defined(OS_WIN) | 185 #if defined(OS_WIN) |
186 HWND AppListView::GetHWND() const { | 186 HWND AppListView::GetHWND() const { |
187 #if defined(USE_AURA) | 187 #if defined(USE_AURA) |
188 gfx::NativeWindow window = | 188 gfx::NativeWindow window = |
189 GetWidget()->GetTopLevelWidget()->GetNativeWindow(); | 189 GetWidget()->GetTopLevelWidget()->GetNativeWindow(); |
190 return window->GetDispatcher()->GetAcceleratedWidget(); | 190 return window->GetDispatcher()->host()->GetAcceleratedWidget(); |
191 #else | 191 #else |
192 return GetWidget()->GetTopLevelWidget()->GetNativeWindow(); | 192 return GetWidget()->GetTopLevelWidget()->GetNativeWindow(); |
193 #endif | 193 #endif |
194 } | 194 } |
195 #endif | 195 #endif |
196 | 196 |
197 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, | 197 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, |
198 PaginationModel* pagination_model, | 198 PaginationModel* pagination_model, |
199 views::BubbleBorder::Arrow arrow, | 199 views::BubbleBorder::Arrow arrow, |
200 bool border_accepts_events, | 200 bool border_accepts_events, |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 // Whether we need to signin or not may have changed since last time we were | 334 // Whether we need to signin or not may have changed since last time we were |
335 // shown. | 335 // shown. |
336 Layout(); | 336 Layout(); |
337 } | 337 } |
338 | 338 |
339 void AppListView::OnAppListModelSigninStatusChanged() { | 339 void AppListView::OnAppListModelSigninStatusChanged() { |
340 OnSigninStatusChanged(); | 340 OnSigninStatusChanged(); |
341 } | 341 } |
342 | 342 |
343 } // namespace app_list | 343 } // namespace app_list |
OLD | NEW |