| Index: chrome/renderer/searchbox/searchbox.h
|
| diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h
|
| index 8ca4de30cbe4b3ceb3b3f39b3fcfebfe31744582..77a2f9a73bf2c380e6e8e95839d4e6f5ff0f9ce1 100644
|
| --- a/chrome/renderer/searchbox/searchbox.h
|
| +++ b/chrome/renderer/searchbox/searchbox.h
|
| @@ -32,7 +32,7 @@ class SearchBox : public content::RenderViewObserver,
|
| void LogEvent(NTPLoggingEventType event);
|
|
|
| // Sends ChromeViewHostMsg_ChromeIdentityCheck to the browser.
|
| - void CheckIsUserSignedInToChromeAs(const string16& identity);
|
| + void CheckIsUserSignedInToChromeAs(const base::string16& identity);
|
|
|
| // Sends ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem to the browser.
|
| void DeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
|
| @@ -77,7 +77,7 @@ class SearchBox : public content::RenderViewObserver,
|
| bool is_most_visited_item_url);
|
|
|
| // Sends ChromeViewHostMsg_SearchBoxPaste to the browser.
|
| - void Paste(const string16& text);
|
| + void Paste(const base::string16& text);
|
|
|
| const ThemeBackgroundInfo& GetThemeBackgroundInfo();
|
|
|
| @@ -102,7 +102,7 @@ class SearchBox : public content::RenderViewObserver,
|
| bool is_input_in_progress() const { return is_input_in_progress_; }
|
| bool is_key_capture_enabled() const { return is_key_capture_enabled_; }
|
| bool display_instant_results() const { return display_instant_results_; }
|
| - const string16& query() const { return query_; }
|
| + const base::string16& query() const { return query_; }
|
| int start_margin() const { return start_margin_; }
|
| const InstantSuggestion& suggestion() const { return suggestion_; }
|
|
|
| @@ -110,7 +110,7 @@ class SearchBox : public content::RenderViewObserver,
|
| // Overridden from content::RenderViewObserver:
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| - void OnChromeIdentityCheckResult(const string16& identity,
|
| + void OnChromeIdentityCheckResult(const base::string16& identity,
|
| bool identity_match);
|
| void OnDetermineIfPageSupportsInstant();
|
| void OnFocusChanged(OmniboxFocusState new_focus_state,
|
| @@ -122,7 +122,7 @@ class SearchBox : public content::RenderViewObserver,
|
| void OnSetDisplayInstantResults(bool display_instant_results);
|
| void OnSetInputInProgress(bool input_in_progress);
|
| void OnSetSuggestionToPrefetch(const InstantSuggestion& suggestion);
|
| - void OnSubmit(const string16& query);
|
| + void OnSubmit(const base::string16& query);
|
| void OnThemeChanged(const ThemeBackgroundInfo& theme_info);
|
| void OnToggleVoiceSearch();
|
|
|
| @@ -142,7 +142,7 @@ class SearchBox : public content::RenderViewObserver,
|
| bool display_instant_results_;
|
| InstantRestrictedIDCache<InstantMostVisitedItem> most_visited_items_cache_;
|
| ThemeBackgroundInfo theme_info_;
|
| - string16 query_;
|
| + base::string16 query_;
|
| int start_margin_;
|
| InstantSuggestion suggestion_;
|
| int width_;
|
|
|