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

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

Issue 6306011: Remove wstring from autocomplete. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Get the blocked-popup content setting's frame in window 125 // Get the blocked-popup content setting's frame in window
126 // coordinates. Used by the blocked-popup animation. Returns 126 // coordinates. Used by the blocked-popup animation. Returns
127 // |NSZeroRect| if the relevant content setting decoration is not 127 // |NSZeroRect| if the relevant content setting decoration is not
128 // visible. 128 // visible.
129 NSRect GetBlockedPopupRect() const; 129 NSRect GetBlockedPopupRect() const;
130 130
131 // AutocompleteEditController implementation. 131 // AutocompleteEditController implementation.
132 virtual void OnAutocompleteWillClosePopup(); 132 virtual void OnAutocompleteWillClosePopup();
133 virtual void OnAutocompleteLosingFocus(gfx::NativeView unused); 133 virtual void OnAutocompleteLosingFocus(gfx::NativeView unused);
134 virtual void OnAutocompleteWillAccept(); 134 virtual void OnAutocompleteWillAccept();
135 virtual bool OnCommitSuggestedText(const std::wstring& typed_text); 135 virtual bool OnCommitSuggestedText(const string16& typed_text);
136 virtual bool AcceptCurrentInstantPreview(); 136 virtual bool AcceptCurrentInstantPreview();
137 virtual void OnPopupBoundsChanged(const gfx::Rect& bounds); 137 virtual void OnPopupBoundsChanged(const gfx::Rect& bounds);
138 virtual void OnAutocompleteAccept(const GURL& url, 138 virtual void OnAutocompleteAccept(const GURL& url,
139 WindowOpenDisposition disposition, 139 WindowOpenDisposition disposition,
140 PageTransition::Type transition, 140 PageTransition::Type transition,
141 const GURL& alternate_nav_url); 141 const GURL& alternate_nav_url);
142 virtual void OnChanged(); 142 virtual void OnChanged();
143 virtual void OnSelectionBoundsChanged(); 143 virtual void OnSelectionBoundsChanged();
144 virtual void OnInputInProgress(bool in_progress); 144 virtual void OnInputInProgress(bool in_progress);
145 virtual void OnKillFocus(); 145 virtual void OnKillFocus();
146 virtual void OnSetFocus(); 146 virtual void OnSetFocus();
147 virtual SkBitmap GetFavIcon() const; 147 virtual SkBitmap GetFavIcon() const;
148 virtual std::wstring GetTitle() const; 148 virtual string16 GetTitle() const;
149 149
150 NSImage* GetKeywordImage(const std::wstring& keyword); 150 NSImage* GetKeywordImage(const string16& keyword);
151 151
152 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 152 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
153 153
154 154
155 // Overridden from NotificationObserver. 155 // Overridden from NotificationObserver.
156 virtual void Observe(NotificationType type, 156 virtual void Observe(NotificationType type,
157 const NotificationSource& source, 157 const NotificationSource& source,
158 const NotificationDetails& details); 158 const NotificationDetails& details);
159 159
160 private: 160 private:
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 // Used to register for notifications received by NotificationObserver. 228 // Used to register for notifications received by NotificationObserver.
229 NotificationRegistrar registrar_; 229 NotificationRegistrar registrar_;
230 230
231 // Used to schedule a task for the first run info bubble. 231 // Used to schedule a task for the first run info bubble.
232 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_; 232 ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_;
233 233
234 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 234 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
235 }; 235 };
236 236
237 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_ 237 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698