chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/html_dialog_window_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

===================================================================

--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h (revision 105162)

+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h (working copy)

@@ -60,7 +60,7 @@

InstantCompleteBehavior behavior) OVERRIDE;

virtual string16 GetInputString() const OVERRIDE;

virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;

- virtual PageTransition::Type GetPageTransition() const OVERRIDE;

+ virtual content::PageTransition GetPageTransition() const OVERRIDE;

virtual void AcceptInput() OVERRIDE;

virtual void FocusLocation(bool select_all) OVERRIDE;

virtual void FocusSearch() OVERRIDE;

@@ -130,7 +130,7 @@

// AutocompleteEditController implementation.

virtual void OnAutocompleteAccept(const GURL& url,

WindowOpenDisposition disposition,

- PageTransition::Type transition,

+ content::PageTransition transition,

const GURL& alternate_nav_url);

virtual void OnChanged();

virtual void OnSelectionBoundsChanged();

@@ -218,7 +218,7 @@

ToolbarModel* toolbar_model_; // Weak, owned by Browser.

// The transition type to use for the navigation.

- PageTransition::Type transition_;

+ content::PageTransition transition_;

// Used to register for notifications received by NotificationObserver.

NotificationRegistrar registrar_;