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

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller.h

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 11 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
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 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 455
456 EventSource event_source_; 456 EventSource event_source_;
457 457
458 // The TabStrip the drag originated from. 458 // The TabStrip the drag originated from.
459 TabStrip* source_tabstrip_; 459 TabStrip* source_tabstrip_;
460 460
461 // The TabStrip the dragged Tab is currently attached to, or NULL if the 461 // The TabStrip the dragged Tab is currently attached to, or NULL if the
462 // dragged Tab is detached. 462 // dragged Tab is detached.
463 TabStrip* attached_tabstrip_; 463 TabStrip* attached_tabstrip_;
464 464
465 // The screen that this drag is associated with. Cached, because other UI
466 // elements are NULLd at various points during the lifetime of this object.
467 gfx::Screen* screen_;
468
469 // The desktop type that this drag is associated with. Cached, because other 465 // The desktop type that this drag is associated with. Cached, because other
470 // UI elements are NULLd at various points during the lifetime of this 466 // UI elements are NULLd at various points during the lifetime of this
471 // object. 467 // object.
472 chrome::HostDesktopType host_desktop_type_; 468 chrome::HostDesktopType host_desktop_type_;
473 469
474 // Whether capture can be released during the drag. When false, capture should 470 // Whether capture can be released during the drag. When false, capture should
475 // not be released when transferring capture between widgets and when starting 471 // not be released when transferring capture between widgets and when starting
476 // the move loop. 472 // the move loop.
477 bool can_release_capture_; 473 bool can_release_capture_;
478 474
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 int attach_index_; 598 int attach_index_;
603 599
604 scoped_ptr<ui::EventHandler> escape_tracker_; 600 scoped_ptr<ui::EventHandler> escape_tracker_;
605 601
606 base::WeakPtrFactory<TabDragController> weak_factory_; 602 base::WeakPtrFactory<TabDragController> weak_factory_;
607 603
608 DISALLOW_COPY_AND_ASSIGN(TabDragController); 604 DISALLOW_COPY_AND_ASSIGN(TabDragController);
609 }; 605 };
610 606
611 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_ 607 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_win.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698