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

Side by Side Diff: chrome/browser/ui/views/tabs/dock_info_win.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
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 "chrome/browser/ui/tabs/dock_info.h" 5 #include "chrome/browser/ui/tabs/dock_info.h"
6 6
7 #include "base/win/scoped_gdi_object.h" 7 #include "base/win/scoped_gdi_object.h"
8 #include "base/win/windows_version.h" 8 #include "base/win/windows_version.h"
9 #include "chrome/browser/ui/ash/tabs/dock_info_ash.h" 9 #include "chrome/browser/ui/ash/tabs/dock_info_ash.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 DockInfo result_; 297 DockInfo result_;
298 298
299 DISALLOW_COPY_AND_ASSIGN(DockToWindowFinder); 299 DISALLOW_COPY_AND_ASSIGN(DockToWindowFinder);
300 }; 300 };
301 301
302 std::set<HWND> RemapIgnoreSet(const std::set<gfx::NativeView>& ignore) { 302 std::set<HWND> RemapIgnoreSet(const std::set<gfx::NativeView>& ignore) {
303 #if defined(USE_AURA) 303 #if defined(USE_AURA)
304 std::set<HWND> hwnd_set; 304 std::set<HWND> hwnd_set;
305 std::set<gfx::NativeView>::const_iterator it = ignore.begin(); 305 std::set<gfx::NativeView>::const_iterator it = ignore.begin();
306 for (; it != ignore.end(); ++it) { 306 for (; it != ignore.end(); ++it) {
307 HWND w = (*it)->GetDispatcher()->GetAcceleratedWidget(); 307 HWND w = (*it)->GetDispatcher()->host()->GetAcceleratedWidget();
308 if (w) 308 if (w)
309 hwnd_set.insert(w); 309 hwnd_set.insert(w);
310 } 310 }
311 return hwnd_set; 311 return hwnd_set;
312 #else 312 #else
313 // NativeViews are already HWNDs on non-Aura Windows. 313 // NativeViews are already HWNDs on non-Aura Windows.
314 return ignore; 314 return ignore;
315 #endif 315 #endif
316 } 316 }
317 317
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 SetWindowPos(window(), HWND_TOP, bounds.x(), bounds.y(), bounds.width(), 396 SetWindowPos(window(), HWND_TOP, bounds.x(), bounds.y(), bounds.width(),
397 bounds.height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER); 397 bounds.height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER);
398 } 398 }
399 399
400 // static 400 // static
401 int DockInfo::GetHotSpotDeltaY() { 401 int DockInfo::GetHotSpotDeltaY() {
402 return Tab::GetMinimumUnselectedSize().height() - 1; 402 return Tab::GetMinimumUnselectedSize().height() - 1;
403 } 403 }
404 404
405 #endif // !USE_AURA 405 #endif // !USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698