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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_DRAGGED_TAB_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 bool pinned; 121 bool pinned;
122 }; 122 };
123 123
124 typedef std::vector<TabDragData> DragData; 124 typedef std::vector<TabDragData> DragData;
125 125
126 // Sets |drag_data| from |tab|. This also registers for necessary 126 // Sets |drag_data| from |tab|. This also registers for necessary
127 // notifications and resets the delegate of the TabContentsWrapper. 127 // notifications and resets the delegate of the TabContentsWrapper.
128 void InitTabDragData(BaseTab* tab, TabDragData* drag_data); 128 void InitTabDragData(BaseTab* tab, TabDragData* drag_data);
129 129
130 // Overridden from TabContentsDelegate: 130 // Overridden from TabContentsDelegate:
131 virtual TabContents* OpenURLFromTab(TabContents* source, 131 virtual TabContents* OpenURLFromTab(
132 const GURL& url, 132 TabContents* source,
133 const GURL& referrer, 133 const GURL& url,
134 WindowOpenDisposition disposition, 134 const GURL& referrer,
135 PageTransition::Type transition) OVERRIDE; 135 WindowOpenDisposition disposition,
136 content::PageTransition transition) OVERRIDE;
136 virtual TabContents* OpenURLFromTab(TabContents* source, 137 virtual TabContents* OpenURLFromTab(TabContents* source,
137 const OpenURLParams& params) OVERRIDE; 138 const OpenURLParams& params) OVERRIDE;
138 virtual void NavigationStateChanged(const TabContents* source, 139 virtual void NavigationStateChanged(const TabContents* source,
139 unsigned changed_flags) OVERRIDE; 140 unsigned changed_flags) OVERRIDE;
140 virtual void AddNewContents(TabContents* source, 141 virtual void AddNewContents(TabContents* source,
141 TabContents* new_contents, 142 TabContents* new_contents,
142 WindowOpenDisposition disposition, 143 WindowOpenDisposition disposition,
143 const gfx::Rect& initial_pos, 144 const gfx::Rect& initial_pos,
144 bool user_gesture) OVERRIDE; 145 bool user_gesture) OVERRIDE;
145 virtual void LoadingStateChanged(TabContents* source) OVERRIDE; 146 virtual void LoadingStateChanged(TabContents* source) OVERRIDE;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 // Index of the source tab in drag_data_. 373 // Index of the source tab in drag_data_.
373 size_t source_tab_index_; 374 size_t source_tab_index_;
374 375
375 // True until |MoveAttached| is invoked once. 376 // True until |MoveAttached| is invoked once.
376 bool initial_move_; 377 bool initial_move_;
377 378
378 DISALLOW_COPY_AND_ASSIGN(DraggedTabController); 379 DISALLOW_COPY_AND_ASSIGN(DraggedTabController);
379 }; 380 };
380 381
381 #endif // CHROME_BROWSER_UI_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_ 382 #endif // CHROME_BROWSER_UI_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | chrome/browser/ui/views/tabs/dragged_tab_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698