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

Side by Side 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 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_COCOA_LOCATION_BAR_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 Profile* profile, 53 Profile* profile,
54 Browser* browser); 54 Browser* browser);
55 virtual ~LocationBarViewMac(); 55 virtual ~LocationBarViewMac();
56 56
57 // Overridden from LocationBar: 57 // Overridden from LocationBar:
58 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE; 58 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE;
59 virtual void SetSuggestedText(const string16& text, 59 virtual void SetSuggestedText(const string16& text,
60 InstantCompleteBehavior behavior) OVERRIDE; 60 InstantCompleteBehavior behavior) OVERRIDE;
61 virtual string16 GetInputString() const OVERRIDE; 61 virtual string16 GetInputString() const OVERRIDE;
62 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 62 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
63 virtual PageTransition::Type GetPageTransition() const OVERRIDE; 63 virtual content::PageTransition GetPageTransition() const OVERRIDE;
64 virtual void AcceptInput() OVERRIDE; 64 virtual void AcceptInput() OVERRIDE;
65 virtual void FocusLocation(bool select_all) OVERRIDE; 65 virtual void FocusLocation(bool select_all) OVERRIDE;
66 virtual void FocusSearch() OVERRIDE; 66 virtual void FocusSearch() OVERRIDE;
67 virtual void UpdateContentSettingsIcons() OVERRIDE; 67 virtual void UpdateContentSettingsIcons() OVERRIDE;
68 virtual void UpdatePageActions() OVERRIDE; 68 virtual void UpdatePageActions() OVERRIDE;
69 virtual void InvalidatePageActions() OVERRIDE; 69 virtual void InvalidatePageActions() OVERRIDE;
70 virtual void SaveStateToContents(TabContents* contents) OVERRIDE; 70 virtual void SaveStateToContents(TabContents* contents) OVERRIDE;
71 virtual void Revert() OVERRIDE; 71 virtual void Revert() OVERRIDE;
72 virtual const OmniboxView* location_entry() const OVERRIDE; 72 virtual const OmniboxView* location_entry() const OVERRIDE;
73 virtual OmniboxView* location_entry() OVERRIDE; 73 virtual OmniboxView* location_entry() OVERRIDE;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 // Get the blocked-popup content setting's frame in window 124 // Get the blocked-popup content setting's frame in window
125 // coordinates. Used by the blocked-popup animation. Returns 125 // coordinates. Used by the blocked-popup animation. Returns
126 // |NSZeroRect| if the relevant content setting decoration is not 126 // |NSZeroRect| if the relevant content setting decoration is not
127 // visible. 127 // visible.
128 NSRect GetBlockedPopupRect() const; 128 NSRect GetBlockedPopupRect() const;
129 129
130 // AutocompleteEditController implementation. 130 // AutocompleteEditController implementation.
131 virtual void OnAutocompleteAccept(const GURL& url, 131 virtual void OnAutocompleteAccept(const GURL& url,
132 WindowOpenDisposition disposition, 132 WindowOpenDisposition disposition,
133 PageTransition::Type transition, 133 content::PageTransition transition,
134 const GURL& alternate_nav_url); 134 const GURL& alternate_nav_url);
135 virtual void OnChanged(); 135 virtual void OnChanged();
136 virtual void OnSelectionBoundsChanged(); 136 virtual void OnSelectionBoundsChanged();
137 virtual void OnInputInProgress(bool in_progress); 137 virtual void OnInputInProgress(bool in_progress);
138 virtual void OnKillFocus(); 138 virtual void OnKillFocus();
139 virtual void OnSetFocus(); 139 virtual void OnSetFocus();
140 virtual SkBitmap GetFavicon() const; 140 virtual SkBitmap GetFavicon() const;
141 virtual string16 GetTitle() const; 141 virtual string16 GetTitle() const;
142 virtual InstantController* GetInstant(); 142 virtual InstantController* GetInstant();
143 virtual TabContentsWrapper* GetTabContentsWrapper() const; 143 virtual TabContentsWrapper* GetTabContentsWrapper() const;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // Keyword hint decoration displayed on the right-hand side. 211 // Keyword hint decoration displayed on the right-hand side.
212 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_; 212 scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_;
213 213
214 Profile* profile_; 214 Profile* profile_;
215 215
216 Browser* browser_; 216 Browser* browser_;
217 217
218 ToolbarModel* toolbar_model_; // Weak, owned by Browser. 218 ToolbarModel* toolbar_model_; // Weak, owned by Browser.
219 219
220 // The transition type to use for the navigation. 220 // The transition type to use for the navigation.
221 PageTransition::Type transition_; 221 content::PageTransition transition_;
222 222
223 // Used to register for notifications received by NotificationObserver. 223 // Used to register for notifications received by NotificationObserver.
224 NotificationRegistrar registrar_; 224 NotificationRegistrar registrar_;
225 225
226 // Used to schedule a task for the first run info bubble. 226 // Used to schedule a task for the first run info bubble.
227 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 227 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
228 228
229 // Used to change the visibility of the star decoration. 229 // Used to change the visibility of the star decoration.
230 BooleanPrefMember edit_bookmarks_enabled_; 230 BooleanPrefMember edit_bookmarks_enabled_;
231 231
232 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 232 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
233 }; 233 };
234 234
235 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ 235 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698