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

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.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_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 virtual void OnSelectionBoundsChanged() OVERRIDE; 104 virtual void OnSelectionBoundsChanged() OVERRIDE;
105 virtual void OnKillFocus() OVERRIDE; 105 virtual void OnKillFocus() OVERRIDE;
106 virtual void OnSetFocus() OVERRIDE; 106 virtual void OnSetFocus() OVERRIDE;
107 virtual void OnInputInProgress(bool in_progress) OVERRIDE; 107 virtual void OnInputInProgress(bool in_progress) OVERRIDE;
108 virtual SkBitmap GetFavicon() const OVERRIDE; 108 virtual SkBitmap GetFavicon() const OVERRIDE;
109 virtual string16 GetTitle() const OVERRIDE; 109 virtual string16 GetTitle() const OVERRIDE;
110 virtual InstantController* GetInstant() OVERRIDE; 110 virtual InstantController* GetInstant() OVERRIDE;
111 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; 111 virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE;
112 112
113 // Implement the LocationBar interface. 113 // Implement the LocationBar interface.
114 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type); 114 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE;
115 virtual void SetSuggestedText(const string16& text, 115 virtual void SetSuggestedText(const string16& text,
116 InstantCompleteBehavior behavior); 116 InstantCompleteBehavior behavior) OVERRIDE;
117 virtual std::wstring GetInputString() const; 117 virtual string16 GetInputString() const OVERRIDE;
118 virtual WindowOpenDisposition GetWindowOpenDisposition() const; 118 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
119 virtual PageTransition::Type GetPageTransition() const; 119 virtual PageTransition::Type GetPageTransition() const OVERRIDE;
120 virtual void AcceptInput(); 120 virtual void AcceptInput() OVERRIDE;
121 virtual void FocusLocation(bool select_all); 121 virtual void FocusLocation(bool select_all) OVERRIDE;
122 virtual void FocusSearch(); 122 virtual void FocusSearch() OVERRIDE;
123 virtual void UpdateContentSettingsIcons(); 123 virtual void UpdateContentSettingsIcons() OVERRIDE;
124 virtual void UpdatePageActions(); 124 virtual void UpdatePageActions() OVERRIDE;
125 virtual void InvalidatePageActions(); 125 virtual void InvalidatePageActions() OVERRIDE;
126 virtual void SaveStateToContents(TabContents* contents); 126 virtual void SaveStateToContents(TabContents* contents) OVERRIDE;
127 virtual void Revert(); 127 virtual void Revert() OVERRIDE;
128 virtual const OmniboxView* location_entry() const; 128 virtual const OmniboxView* location_entry() const OVERRIDE;
129 virtual OmniboxView* location_entry(); 129 virtual OmniboxView* location_entry() OVERRIDE;
130 virtual LocationBarTesting* GetLocationBarForTesting(); 130 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
131 131
132 // Implement the LocationBarTesting interface. 132 // Implement the LocationBarTesting interface.
133 virtual int PageActionCount(); 133 virtual int PageActionCount() OVERRIDE;
134 virtual int PageActionVisibleCount(); 134 virtual int PageActionVisibleCount() OVERRIDE;
135 virtual ExtensionAction* GetPageAction(size_t index); 135 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE;
136 virtual ExtensionAction* GetVisiblePageAction(size_t index); 136 virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE;
137 virtual void TestPageActionPressed(size_t index); 137 virtual void TestPageActionPressed(size_t index) OVERRIDE;
138 138
139 // Implement the NotificationObserver interface. 139 // Implement the NotificationObserver interface.
140 virtual void Observe(int type, 140 virtual void Observe(int type,
141 const NotificationSource& source, 141 const NotificationSource& source,
142 const NotificationDetails& details); 142 const NotificationDetails& details);
143 143
144 // Edit background color. 144 // Edit background color.
145 static const GdkColor kBackgroundColor; 145 static const GdkColor kBackgroundColor;
146 146
147 private: 147 private:
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 GtkWidget* location_entry_alignment_; 411 GtkWidget* location_entry_alignment_;
412 412
413 Profile* profile_; 413 Profile* profile_;
414 CommandUpdater* command_updater_; 414 CommandUpdater* command_updater_;
415 ToolbarModel* toolbar_model_; 415 ToolbarModel* toolbar_model_;
416 Browser* browser_; 416 Browser* browser_;
417 417
418 // When we get an OnAutocompleteAccept notification from the autocomplete 418 // When we get an OnAutocompleteAccept notification from the autocomplete
419 // edit, we save the input string so we can give it back to the browser on 419 // edit, we save the input string so we can give it back to the browser on
420 // the LocationBar interface via GetInputString(). 420 // the LocationBar interface via GetInputString().
421 std::wstring location_input_; 421 string16 location_input_;
422 422
423 // The user's desired disposition for how their input should be opened. 423 // The user's desired disposition for how their input should be opened.
424 WindowOpenDisposition disposition_; 424 WindowOpenDisposition disposition_;
425 425
426 // The transition type to use for the navigation. 426 // The transition type to use for the navigation.
427 PageTransition::Type transition_; 427 PageTransition::Type transition_;
428 428
429 // Used to schedule a task for the first run bubble. 429 // Used to schedule a task for the first run bubble.
430 ScopedRunnableMethodFactory<LocationBarViewGtk> first_run_bubble_; 430 ScopedRunnableMethodFactory<LocationBarViewGtk> first_run_bubble_;
431 431
(...skipping 22 matching lines...) Expand all
454 // The last search keyword that was shown via the |tab_to_search_box_|. 454 // The last search keyword that was shown via the |tab_to_search_box_|.
455 string16 last_keyword_; 455 string16 last_keyword_;
456 456
457 // Used to change the visibility of the star decoration. 457 // Used to change the visibility of the star decoration.
458 BooleanPrefMember edit_bookmarks_enabled_; 458 BooleanPrefMember edit_bookmarks_enabled_;
459 459
460 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 460 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
461 }; 461 };
462 462
463 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 463 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698