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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.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_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 virtual int GetDragOperationsForView(View* sender, 234 virtual int GetDragOperationsForView(View* sender,
235 const gfx::Point& p) OVERRIDE; 235 const gfx::Point& p) OVERRIDE;
236 virtual bool CanStartDragForView(View* sender, 236 virtual bool CanStartDragForView(View* sender,
237 const gfx::Point& press_pt, 237 const gfx::Point& press_pt,
238 const gfx::Point& p) OVERRIDE; 238 const gfx::Point& p) OVERRIDE;
239 239
240 // Overridden from LocationBar: 240 // Overridden from LocationBar:
241 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE; 241 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE;
242 virtual void SetSuggestedText(const string16& text, 242 virtual void SetSuggestedText(const string16& text,
243 InstantCompleteBehavior behavior) OVERRIDE; 243 InstantCompleteBehavior behavior) OVERRIDE;
244 virtual std::wstring GetInputString() const OVERRIDE; 244 virtual string16 GetInputString() const OVERRIDE;
245 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 245 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
246 virtual PageTransition::Type GetPageTransition() const OVERRIDE; 246 virtual PageTransition::Type GetPageTransition() const OVERRIDE;
247 virtual void AcceptInput() OVERRIDE; 247 virtual void AcceptInput() OVERRIDE;
248 virtual void FocusLocation(bool select_all) OVERRIDE; 248 virtual void FocusLocation(bool select_all) OVERRIDE;
249 virtual void FocusSearch() OVERRIDE; 249 virtual void FocusSearch() OVERRIDE;
250 virtual void UpdateContentSettingsIcons() OVERRIDE; 250 virtual void UpdateContentSettingsIcons() OVERRIDE;
251 virtual void UpdatePageActions() OVERRIDE; 251 virtual void UpdatePageActions() OVERRIDE;
252 virtual void InvalidatePageActions() OVERRIDE; 252 virtual void InvalidatePageActions() OVERRIDE;
253 virtual void SaveStateToContents(TabContents* contents) OVERRIDE; 253 virtual void SaveStateToContents(TabContents* contents) OVERRIDE;
254 virtual void Revert() OVERRIDE; 254 virtual void Revert() OVERRIDE;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 Browser* browser_; 349 Browser* browser_;
350 350
351 // The model. 351 // The model.
352 ToolbarModel* model_; 352 ToolbarModel* model_;
353 353
354 // Our delegate. 354 // Our delegate.
355 Delegate* delegate_; 355 Delegate* delegate_;
356 356
357 // This is the string of text from the autocompletion session that the user 357 // This is the string of text from the autocompletion session that the user
358 // entered or selected. 358 // entered or selected.
359 std::wstring location_input_; 359 string16 location_input_;
360 360
361 // The user's desired disposition for how their input should be opened 361 // The user's desired disposition for how their input should be opened
362 WindowOpenDisposition disposition_; 362 WindowOpenDisposition disposition_;
363 363
364 // The transition type to use for the navigation 364 // The transition type to use for the navigation
365 PageTransition::Type transition_; 365 PageTransition::Type transition_;
366 366
367 // Font used by edit and some of the hints. 367 // Font used by edit and some of the hints.
368 gfx::Font font_; 368 gfx::Font font_;
369 369
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 // While animating, the host clips the widget and draws only the bottom 426 // While animating, the host clips the widget and draws only the bottom
427 // part of it. The view needs to know the pixel offset at which we are drawing 427 // part of it. The view needs to know the pixel offset at which we are drawing
428 // the widget so that we can draw the curved edges that attach to the toolbar 428 // the widget so that we can draw the curved edges that attach to the toolbar
429 // in the right location. 429 // in the right location.
430 int animation_offset_; 430 int animation_offset_;
431 431
432 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 432 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
433 }; 433 };
434 434
435 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 435 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/location_bar.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698