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

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

Issue 149717: [Mac] Refactor location-bar autocomplete cell classes. (Closed)
Patch Set: jrg comment Created 11 years, 5 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_COCOA_LOCATION_BAR_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
6 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ 6 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
11 #include "chrome/browser/autocomplete/autocomplete_edit.h" 11 #include "chrome/browser/autocomplete/autocomplete_edit.h"
12 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" 12 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
13 #include "chrome/browser/location_bar.h" 13 #include "chrome/browser/location_bar.h"
14 14
15 @class AutocompleteTextField;
15 class CommandUpdater; 16 class CommandUpdater;
16 class ToolbarModel; 17 class ToolbarModel;
17 18
18 // A C++ bridge class that represents the location bar UI element to 19 // A C++ bridge class that represents the location bar UI element to
19 // the portable code. Wires up an AutocompleteEditViewMac instance to 20 // the portable code. Wires up an AutocompleteEditViewMac instance to
20 // the location bar text field, which handles most of the work. 21 // the location bar text field, which handles most of the work.
21 22
22 class LocationBarViewMac : public AutocompleteEditController, 23 class LocationBarViewMac : public AutocompleteEditController,
23 public LocationBar, 24 public LocationBar,
24 public LocationBarTesting { 25 public LocationBarTesting {
25 public: 26 public:
26 LocationBarViewMac(NSTextField* field, 27 LocationBarViewMac(AutocompleteTextField* field,
27 CommandUpdater* command_updater, 28 CommandUpdater* command_updater,
28 ToolbarModel* toolbar_model, 29 ToolbarModel* toolbar_model,
29 Profile* profile); 30 Profile* profile);
30 virtual ~LocationBarViewMac(); 31 virtual ~LocationBarViewMac();
31 32
32 // Overridden from LocationBar: 33 // Overridden from LocationBar:
33 virtual void ShowFirstRunBubble(bool use_OEM_bubble) { NOTIMPLEMENTED(); } 34 virtual void ShowFirstRunBubble(bool use_OEM_bubble) { NOTIMPLEMENTED(); }
34 virtual std::wstring GetInputString() const; 35 virtual std::wstring GetInputString() const;
35 virtual WindowOpenDisposition GetWindowOpenDisposition() const; 36 virtual WindowOpenDisposition GetWindowOpenDisposition() const;
36 virtual PageTransition::Type GetPageTransition() const; 37 virtual PageTransition::Type GetPageTransition() const;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // The user's desired disposition for how their input should be opened. 78 // The user's desired disposition for how their input should be opened.
78 WindowOpenDisposition disposition_; 79 WindowOpenDisposition disposition_;
79 80
80 // The transition type to use for the navigation. 81 // The transition type to use for the navigation.
81 PageTransition::Type transition_; 82 PageTransition::Type transition_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 84 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
84 }; 85 };
85 86
86 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_ 87 #endif // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/location_bar_fieldeditor_unittest.mm ('k') | chrome/browser/cocoa/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698