Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: ui/app_list/views/app_list_view.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « printing/printing_context_win.cc ('k') | ui/aura/client/default_capture_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // static 161 // static
162 void AppListView::SetNextPaintCallback(const base::Closure& callback) { 162 void AppListView::SetNextPaintCallback(const base::Closure& callback) {
163 g_next_paint_callback = callback; 163 g_next_paint_callback = callback;
164 } 164 }
165 165
166 #if defined(OS_WIN) 166 #if defined(OS_WIN)
167 HWND AppListView::GetHWND() const { 167 HWND AppListView::GetHWND() const {
168 #if defined(USE_AURA) 168 #if defined(USE_AURA)
169 gfx::NativeWindow window = 169 gfx::NativeWindow window =
170 GetWidget()->GetTopLevelWidget()->GetNativeWindow(); 170 GetWidget()->GetTopLevelWidget()->GetNativeWindow();
171 return window->GetRootWindow()->GetAcceleratedWidget(); 171 return window->GetDispatcher()->GetAcceleratedWidget();
172 #else 172 #else
173 return GetWidget()->GetTopLevelWidget()->GetNativeWindow(); 173 return GetWidget()->GetTopLevelWidget()->GetNativeWindow();
174 #endif 174 #endif
175 } 175 }
176 #endif 176 #endif
177 177
178 void AppListView::InitAsBubbleInternal(gfx::NativeView parent, 178 void AppListView::InitAsBubbleInternal(gfx::NativeView parent,
179 PaginationModel* pagination_model, 179 PaginationModel* pagination_model,
180 views::BubbleBorder::Arrow arrow, 180 views::BubbleBorder::Arrow arrow,
181 bool border_accepts_events, 181 bool border_accepts_events,
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 316
317 void AppListView::OnAppListModelSigninStatusChanged() { 317 void AppListView::OnAppListModelSigninStatusChanged() {
318 OnSigninStatusChanged(); 318 OnSigninStatusChanged();
319 } 319 }
320 320
321 void AppListView::OnAppListModelUsersChanged() { 321 void AppListView::OnAppListModelUsersChanged() {
322 OnSigninStatusChanged(); 322 OnSigninStatusChanged();
323 } 323 }
324 324
325 } // namespace app_list 325 } // namespace app_list
OLDNEW
« no previous file with comments | « printing/printing_context_win.cc ('k') | ui/aura/client/default_capture_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698