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

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

Issue 9565004: Revert 124385 - Allows tab dragging when maximized on aura. To fix it I made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER2_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER2_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER2_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER2_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 static TabStripModel* GetModel(TabStrip* tabstrip); 272 static TabStripModel* GetModel(TabStrip* tabstrip);
273 273
274 // Returns the BrowserView of the currently attached TabStrip. 274 // Returns the BrowserView of the currently attached TabStrip.
275 BrowserView* GetAttachedBrowserView(); 275 BrowserView* GetAttachedBrowserView();
276 276
277 // Creates and returns a new Browser to handle the drag. 277 // Creates and returns a new Browser to handle the drag.
278 Browser* CreateBrowserForDrag(TabStrip* source, 278 Browser* CreateBrowserForDrag(TabStrip* source,
279 const gfx::Point& screen_point, 279 const gfx::Point& screen_point,
280 std::vector<gfx::Rect>* drag_bounds); 280 std::vector<gfx::Rect>* drag_bounds);
281 281
282 // Marks whether |window| is constrained. While dragging we set this to false
283 // to allow maximized windows to move any where.
284 void SetTrackedByWorkspace(gfx::NativeWindow window, bool value);
285
286 // Handles registering for notifications. 282 // Handles registering for notifications.
287 content::NotificationRegistrar registrar_; 283 content::NotificationRegistrar registrar_;
288 284
289 // The TabStrip the drag originated from. This is set to NULL if the source 285 // The TabStrip the drag originated from. This is set to NULL if the source
290 // tabstrip is deleted while we're detached. 286 // tabstrip is deleted while we're detached.
291 TabStrip* source_tabstrip_; 287 TabStrip* source_tabstrip_;
292 288
293 // The TabStrip the dragged Tab is currently attached to, or NULL if the 289 // The TabStrip the dragged Tab is currently attached to, or NULL if the
294 // dragged Tab is detached. 290 // dragged Tab is detached.
295 TabStrip* attached_tabstrip_; 291 TabStrip* attached_tabstrip_;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 // Non-null for the duration of RunMoveLoop. 382 // Non-null for the duration of RunMoveLoop.
387 BrowserView* move_loop_browser_view_; 383 BrowserView* move_loop_browser_view_;
388 384
389 // If non-null set to true from destructor. 385 // If non-null set to true from destructor.
390 bool* destroyed_; 386 bool* destroyed_;
391 387
392 DISALLOW_COPY_AND_ASSIGN(TabDragController2); 388 DISALLOW_COPY_AND_ASSIGN(TabDragController2);
393 }; 389 };
394 390
395 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER2_H_ 391 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_DRAG_CONTROLLER2_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698