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

Side by Side Diff: chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.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_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 // The tab (NavigationController) was destroyed during the drag. 79 // The tab (NavigationController) was destroyed during the drag.
80 TAB_DESTROYED 80 TAB_DESTROYED
81 }; 81 };
82 82
83 DraggedTabData InitDraggedTabData(TabGtk* tab); 83 DraggedTabData InitDraggedTabData(TabGtk* tab);
84 84
85 // Overridden from TabContentsDelegate: 85 // Overridden from TabContentsDelegate:
86 // Deprecated. Please use the two-arguments variant instead. 86 // Deprecated. Please use the two-arguments variant instead.
87 // TODO(adriansc): Remove this method once refactoring changed all call sites. 87 // TODO(adriansc): Remove this method once refactoring changed all call sites.
88 virtual TabContents* OpenURLFromTab(TabContents* source, 88 virtual TabContents* OpenURLFromTab(
89 const GURL& url, 89 TabContents* source,
90 const GURL& referrer, 90 const GURL& url,
91 WindowOpenDisposition disposition, 91 const GURL& referrer,
92 PageTransition::Type transition) OVERRIDE; 92 WindowOpenDisposition disposition,
93 content::PageTransition transition) OVERRIDE;
93 virtual TabContents* OpenURLFromTab(TabContents* source, 94 virtual TabContents* OpenURLFromTab(TabContents* source,
94 const OpenURLParams& params) OVERRIDE; 95 const OpenURLParams& params) OVERRIDE;
95 virtual void NavigationStateChanged(const TabContents* source, 96 virtual void NavigationStateChanged(const TabContents* source,
96 unsigned changed_flags); 97 unsigned changed_flags);
97 virtual void AddNewContents(TabContents* source, 98 virtual void AddNewContents(TabContents* source,
98 TabContents* new_contents, 99 TabContents* new_contents,
99 WindowOpenDisposition disposition, 100 WindowOpenDisposition disposition,
100 const gfx::Rect& initial_pos, 101 const gfx::Rect& initial_pos,
101 bool user_gesture); 102 bool user_gesture);
102 virtual void LoadingStateChanged(TabContents* source); 103 virtual void LoadingStateChanged(TabContents* source);
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 266
266 // Timer used to bring the window under the cursor to front. If the user 267 // Timer used to bring the window under the cursor to front. If the user
267 // stops moving the mouse for a brief time over a browser window, it is 268 // stops moving the mouse for a brief time over a browser window, it is
268 // brought to front. 269 // brought to front.
269 base::OneShotTimer<DraggedTabControllerGtk> bring_to_front_timer_; 270 base::OneShotTimer<DraggedTabControllerGtk> bring_to_front_timer_;
270 271
271 DISALLOW_COPY_AND_ASSIGN(DraggedTabControllerGtk); 272 DISALLOW_COPY_AND_ASSIGN(DraggedTabControllerGtk);
272 }; 273 };
273 274
274 #endif // CHROME_BROWSER_UI_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_ 275 #endif // CHROME_BROWSER_UI_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/sad_tab_gtk.cc ('k') | chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698