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

Side by Side Diff: content/browser/tab_contents/tab_contents.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 CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 // Commands ------------------------------------------------------------------ 249 // Commands ------------------------------------------------------------------
250 250
251 // Implementation of PageNavigator. 251 // Implementation of PageNavigator.
252 252
253 // Deprecated. Please use the one-argument variant instead. 253 // Deprecated. Please use the one-argument variant instead.
254 // TODO(adriansc): Remove this method once refactoring changed all call sites. 254 // TODO(adriansc): Remove this method once refactoring changed all call sites.
255 virtual TabContents* OpenURL(const GURL& url, 255 virtual TabContents* OpenURL(const GURL& url,
256 const GURL& referrer, 256 const GURL& referrer,
257 WindowOpenDisposition disposition, 257 WindowOpenDisposition disposition,
258 PageTransition::Type transition) OVERRIDE; 258 content::PageTransition transition) OVERRIDE;
259 259
260 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE; 260 virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE;
261 261
262 // Called by the NavigationController to cause the TabContents to navigate to 262 // Called by the NavigationController to cause the TabContents to navigate to
263 // the current pending entry. The NavigationController should be called back 263 // the current pending entry. The NavigationController should be called back
264 // with RendererDidNavigate on success or DiscardPendingEntry on failure. 264 // with RendererDidNavigate on success or DiscardPendingEntry on failure.
265 // The callbacks can be inside of this function, or at some future time. 265 // The callbacks can be inside of this function, or at some future time.
266 // 266 //
267 // The entry has a PageID of -1 if newly created (corresponding to navigation 267 // The entry has a PageID of -1 if newly created (corresponding to navigation
268 // to a new URL). 268 // to a new URL).
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 ObserverList<TabContentsObserver> observers_; 844 ObserverList<TabContentsObserver> observers_;
845 845
846 // Content restrictions, used to disable print/copy etc based on content's 846 // Content restrictions, used to disable print/copy etc based on content's
847 // (full-page plugins for now only) permissions. 847 // (full-page plugins for now only) permissions.
848 int content_restrictions_; 848 int content_restrictions_;
849 849
850 DISALLOW_COPY_AND_ASSIGN(TabContents); 850 DISALLOW_COPY_AND_ASSIGN(TabContents);
851 }; 851 };
852 852
853 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 853 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « content/browser/tab_contents/render_view_host_manager_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698