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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_LOCATION_BAR_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 LocationBarViewMac(AutocompleteTextField* field, 52 LocationBarViewMac(AutocompleteTextField* field,
53 CommandUpdater* command_updater, 53 CommandUpdater* command_updater,
54 Profile* profile, 54 Profile* profile,
55 Browser* browser); 55 Browser* browser);
56 virtual ~LocationBarViewMac(); 56 virtual ~LocationBarViewMac();
57 57
58 // Overridden from LocationBar: 58 // Overridden from LocationBar:
59 virtual void ShowFirstRunBubble() OVERRIDE; 59 virtual void ShowFirstRunBubble() OVERRIDE;
60 virtual GURL GetDestinationURL() const OVERRIDE; 60 virtual GURL GetDestinationURL() const OVERRIDE;
61 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 61 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
62 virtual content::PageTransition GetPageTransition() const OVERRIDE; 62 virtual ui::PageTransition GetPageTransition() const OVERRIDE;
63 virtual void AcceptInput() OVERRIDE; 63 virtual void AcceptInput() OVERRIDE;
64 virtual void FocusLocation(bool select_all) OVERRIDE; 64 virtual void FocusLocation(bool select_all) OVERRIDE;
65 virtual void FocusSearch() OVERRIDE; 65 virtual void FocusSearch() OVERRIDE;
66 virtual void UpdateContentSettingsIcons() OVERRIDE; 66 virtual void UpdateContentSettingsIcons() OVERRIDE;
67 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE; 67 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE;
68 virtual void UpdatePageActions() OVERRIDE; 68 virtual void UpdatePageActions() OVERRIDE;
69 virtual void InvalidatePageActions() OVERRIDE; 69 virtual void InvalidatePageActions() OVERRIDE;
70 virtual void UpdateBookmarkStarVisibility() OVERRIDE; 70 virtual void UpdateBookmarkStarVisibility() OVERRIDE;
71 virtual bool ShowPageActionPopup(const extensions::Extension* extension, 71 virtual bool ShowPageActionPopup(const extensions::Extension* extension,
72 bool grant_active_tab) OVERRIDE; 72 bool grant_active_tab) OVERRIDE;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 // Used to schedule a task for the first run info bubble. 274 // Used to schedule a task for the first run info bubble.
275 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 275 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
276 276
277 // Used to change the visibility of the star decoration. 277 // Used to change the visibility of the star decoration.
278 BooleanPrefMember edit_bookmarks_enabled_; 278 BooleanPrefMember edit_bookmarks_enabled_;
279 279
280 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 280 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
281 }; 281 };
282 282
283 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 283 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698