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

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

Issue 12096103: Reland: Aura: Fix crash on dragging URL into tab strip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab_strip.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 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 typedef std::map<int, std::vector<Tab*> > TabsClosingMap; 249 typedef std::map<int, std::vector<Tab*> > TabsClosingMap;
250 250
251 class RemoveTabDelegate; 251 class RemoveTabDelegate;
252 252
253 friend class TabDragController; 253 friend class TabDragController;
254 friend class TabDragControllerTest; 254 friend class TabDragControllerTest;
255 255
256 // Used during a drop session of a url. Tracks the position of the drop as 256 // Used during a drop session of a url. Tracks the position of the drop as
257 // well as a window used to highlight where the drop occurs. 257 // well as a window used to highlight where the drop occurs.
258 struct DropInfo { 258 struct DropInfo {
259 DropInfo(int index, bool drop_before, bool paint_down); 259 DropInfo(int drop_index,
260 bool drop_before,
261 bool point_down,
262 views::Widget* context);
260 ~DropInfo(); 263 ~DropInfo();
261 264
262 // Index of the tab to drop on. If drop_before is true, the drop should 265 // Index of the tab to drop on. If drop_before is true, the drop should
263 // occur between the tab at drop_index - 1 and drop_index. 266 // occur between the tab at drop_index - 1 and drop_index.
264 // WARNING: if drop_before is true it is possible this will == tab_count, 267 // WARNING: if drop_before is true it is possible this will == tab_count,
265 // which indicates the drop should create a new tab at the end of the tabs. 268 // which indicates the drop should create a new tab at the end of the tabs.
266 int drop_index; 269 int drop_index;
267 bool drop_before; 270 bool drop_before;
268 271
269 // Direction the arrow should point in. If true, the arrow is displayed 272 // Direction the arrow should point in. If true, the arrow is displayed
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 bool immersive_style_; 604 bool immersive_style_;
602 605
603 // Our observers. 606 // Our observers.
604 typedef ObserverList<TabStripObserver> TabStripObservers; 607 typedef ObserverList<TabStripObserver> TabStripObservers;
605 TabStripObservers observers_; 608 TabStripObservers observers_;
606 609
607 DISALLOW_COPY_AND_ASSIGN(TabStrip); 610 DISALLOW_COPY_AND_ASSIGN(TabStrip);
608 }; 611 };
609 612
610 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 613 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698