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

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

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 years, 2 months 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/browser_list.h" 9 #include "chrome/browser/ui/browser_list.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 return true; 235 return true;
236 } 236 }
237 return false; 237 return false;
238 } 238 }
239 239
240 private: 240 private:
241 DockToWindowFinder(const gfx::Point& screen_loc, 241 DockToWindowFinder(const gfx::Point& screen_loc,
242 const std::set<HWND>& ignore) 242 const std::set<HWND>& ignore)
243 : BaseWindowFinder(ignore), 243 : BaseWindowFinder(ignore),
244 screen_loc_(screen_loc) { 244 screen_loc_(screen_loc) {
245 gfx::Rect work_area = gfx::Screen::GetDisplayNearestPoint( 245 gfx::Rect work_area = gfx::Screen::GetNativeScreen()->
246 screen_loc).bounds(); 246 GetDisplayNearestPoint(screen_loc).bounds();
247 if (!work_area.IsEmpty()) { 247 if (!work_area.IsEmpty()) {
248 result_.set_monitor_bounds(work_area); 248 result_.set_monitor_bounds(work_area);
249 EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, as_lparam()); 249 EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, as_lparam());
250 } 250 }
251 } 251 }
252 252
253 bool CheckPoint(HWND hwnd, int x, int y, DockInfo::Type type) { 253 bool CheckPoint(HWND hwnd, int x, int y, DockInfo::Type type) {
254 bool in_enable_area; 254 bool in_enable_area;
255 if (DockInfo::IsCloseToPoint(screen_loc_, x, y, &in_enable_area)) { 255 if (DockInfo::IsCloseToPoint(screen_loc_, x, y, &in_enable_area)) {
256 result_.set_in_enable_area(in_enable_area); 256 result_.set_in_enable_area(in_enable_area);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 ShowWindow(window(), SW_RESTORE | SW_SHOWNA); 325 ShowWindow(window(), SW_RESTORE | SW_SHOWNA);
326 } 326 }
327 SetWindowPos(window(), HWND_TOP, bounds.x(), bounds.y(), bounds.width(), 327 SetWindowPos(window(), HWND_TOP, bounds.x(), bounds.y(), bounds.width(),
328 bounds.height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER); 328 bounds.height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER);
329 } 329 }
330 330
331 // static 331 // static
332 int DockInfo::GetHotSpotDeltaY() { 332 int DockInfo::GetHotSpotDeltaY() {
333 return Tab::GetMinimumUnselectedSize().height() - 1; 333 return Tab::GetMinimumUnselectedSize().height() - 1;
334 } 334 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698