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

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

Issue 7550050: Convert LocationBar::GetInputString from wstring to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gurl string16 Created 9 years, 4 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 public NotificationObserver { 47 public NotificationObserver {
48 public: 48 public:
49 LocationBarViewMac(AutocompleteTextField* field, 49 LocationBarViewMac(AutocompleteTextField* field,
50 CommandUpdater* command_updater, 50 CommandUpdater* command_updater,
51 ToolbarModel* toolbar_model, 51 ToolbarModel* toolbar_model,
52 Profile* profile, 52 Profile* profile,
53 Browser* browser); 53 Browser* browser);
54 virtual ~LocationBarViewMac(); 54 virtual ~LocationBarViewMac();
55 55
56 // Overridden from LocationBar: 56 // Overridden from LocationBar:
57 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type); 57 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE;
58 virtual void SetSuggestedText(const string16& text, 58 virtual void SetSuggestedText(const string16& text,
59 InstantCompleteBehavior behavior); 59 InstantCompleteBehavior behavior) OVERRIDE;
60 virtual std::wstring GetInputString() const; 60 virtual string16 GetInputString() const OVERRIDE;
61 virtual WindowOpenDisposition GetWindowOpenDisposition() const; 61 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
62 virtual PageTransition::Type GetPageTransition() const; 62 virtual PageTransition::Type GetPageTransition() const OVERRIDE;
63 virtual void AcceptInput(); 63 virtual void AcceptInput() OVERRIDE;
64 virtual void FocusLocation(bool select_all); 64 virtual void FocusLocation(bool select_all) OVERRIDE;
65 virtual void FocusSearch(); 65 virtual void FocusSearch() OVERRIDE;
66 virtual void UpdateContentSettingsIcons(); 66 virtual void UpdateContentSettingsIcons() OVERRIDE;
67 virtual void UpdatePageActions(); 67 virtual void UpdatePageActions() OVERRIDE;
68 virtual void InvalidatePageActions(); 68 virtual void InvalidatePageActions() OVERRIDE;
69 virtual void SaveStateToContents(TabContents* contents); 69 virtual void SaveStateToContents(TabContents* contents) OVERRIDE;
70 virtual void Revert(); 70 virtual void Revert() OVERRIDE;
71 virtual const OmniboxView* location_entry() const; 71 virtual const OmniboxView* location_entry() const OVERRIDE;
72 virtual OmniboxView* location_entry(); 72 virtual OmniboxView* location_entry() OVERRIDE;
73 virtual LocationBarTesting* GetLocationBarForTesting(); 73 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
74 74
75 // Overridden from LocationBarTesting: 75 // Overridden from LocationBarTesting:
76 virtual int PageActionCount(); 76 virtual int PageActionCount() OVERRIDE;
77 virtual int PageActionVisibleCount(); 77 virtual int PageActionVisibleCount() OVERRIDE;
78 virtual ExtensionAction* GetPageAction(size_t index); 78 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE;
79 virtual ExtensionAction* GetVisiblePageAction(size_t index); 79 virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE;
80 virtual void TestPageActionPressed(size_t index); 80 virtual void TestPageActionPressed(size_t index) OVERRIDE;
81 81
82 // Set/Get the editable state of the field. 82 // Set/Get the editable state of the field.
83 void SetEditable(bool editable); 83 void SetEditable(bool editable);
84 bool IsEditable(); 84 bool IsEditable();
85 85
86 // Set the starred state of the bookmark star. 86 // Set the starred state of the bookmark star.
87 void SetStarred(bool starred); 87 void SetStarred(bool starred);
88 88
89 // Get the point on the star for the bookmark bubble to aim at. 89 // Get the point on the star for the bookmark bubble to aim at.
90 NSPoint GetBookmarkBubblePoint() const; 90 NSPoint GetBookmarkBubblePoint() const;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 176
177 scoped_ptr<OmniboxViewMac> omnibox_view_; 177 scoped_ptr<OmniboxViewMac> omnibox_view_;
178 178
179 CommandUpdater* command_updater_; // Weak, owned by Browser. 179 CommandUpdater* command_updater_; // Weak, owned by Browser.
180 180
181 AutocompleteTextField* field_; // owned by tab controller 181 AutocompleteTextField* field_; // owned by tab controller
182 182
183 // When we get an OnAutocompleteAccept notification from the autocomplete 183 // When we get an OnAutocompleteAccept notification from the autocomplete
184 // edit, we save the input string so we can give it back to the browser on 184 // edit, we save the input string so we can give it back to the browser on
185 // the LocationBar interface via GetInputString(). 185 // the LocationBar interface via GetInputString().
186 std::wstring location_input_; 186 string16 location_input_;
187 187
188 // The user's desired disposition for how their input should be opened. 188 // The user's desired disposition for how their input should be opened.
189 WindowOpenDisposition disposition_; 189 WindowOpenDisposition disposition_;
190 190
191 // A decoration that shows an icon to the left of the address. 191 // A decoration that shows an icon to the left of the address.
192 scoped_ptr<LocationIconDecoration> location_icon_decoration_; 192 scoped_ptr<LocationIconDecoration> location_icon_decoration_;
193 193
194 // A decoration that shows the keyword-search bubble on the left. 194 // A decoration that shows the keyword-search bubble on the left.
195 scoped_ptr<SelectedKeywordDecoration> selected_keyword_decoration_; 195 scoped_ptr<SelectedKeywordDecoration> selected_keyword_decoration_;
196 196
(...skipping 28 matching lines...) Expand all
225 // Used to schedule a task for the first run info bubble. 225 // Used to schedule a task for the first run info bubble.
226 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_; 226 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_;
227 227
228 // Used to change the visibility of the star decoration. 228 // Used to change the visibility of the star decoration.
229 BooleanPrefMember edit_bookmarks_enabled_; 229 BooleanPrefMember edit_bookmarks_enabled_;
230 230
231 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 231 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
232 }; 232 };
233 233
234 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ 234 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698