chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h - Issue 11262015: Remove unused / unnecessary stuff from Instant.

Side by Side Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h

Issue 11262015: Remove unused / unnecessary stuff from Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/browser_instant_controller.cc ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm » ('j') | chrome/browser/ui/views/location_bar/suggested_text_view.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_OMNIBOX_OMNIBOX_VIEW_MAC_H_	5 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_

6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_	6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_

7	7

8 #import <Cocoa/Cocoa.h>	8 #import <Cocoa/Cocoa.h>

9	9

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 const string16& display_text,	52 const string16& display_text,

53 bool save_original_selection) OVERRIDE;	53 bool save_original_selection) OVERRIDE;

54 virtual bool OnInlineAutocompleteTextMaybeChanged(	54 virtual bool OnInlineAutocompleteTextMaybeChanged(

55 const string16& display_text, size_t user_text_length) OVERRIDE;	55 const string16& display_text, size_t user_text_length) OVERRIDE;

56 virtual void OnStartingIME() OVERRIDE;	56 virtual void OnStartingIME() OVERRIDE;

57 virtual void OnRevertTemporaryText() OVERRIDE;	57 virtual void OnRevertTemporaryText() OVERRIDE;

58 virtual void OnBeforePossibleChange() OVERRIDE;	58 virtual void OnBeforePossibleChange() OVERRIDE;

59 virtual bool OnAfterPossibleChange() OVERRIDE;	59 virtual bool OnAfterPossibleChange() OVERRIDE;

60 virtual gfx::NativeView GetNativeView() const OVERRIDE;	60 virtual gfx::NativeView GetNativeView() const OVERRIDE;

61 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;	61 virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;

62 virtual void SetInstantSuggestion(const string16& input,	62 virtual void SetInstantSuggestion(const string16& input) OVERRIDE;

63 bool animate_to_complete) OVERRIDE;

64 virtual string16 GetInstantSuggestion() const OVERRIDE;	63 virtual string16 GetInstantSuggestion() const OVERRIDE;

65 virtual int TextWidth() const OVERRIDE;	64 virtual int TextWidth() const OVERRIDE;

66 virtual bool IsImeComposing() const OVERRIDE;	65 virtual bool IsImeComposing() const OVERRIDE;

67	66

68 // Implement the AutocompleteTextFieldObserver interface.	67 // Implement the AutocompleteTextFieldObserver interface.

69 virtual NSRange SelectionRangeForProposedRange(	68 virtual NSRange SelectionRangeForProposedRange(

70 NSRange proposed_range) OVERRIDE;	69 NSRange proposed_range) OVERRIDE;

71 virtual void OnControlKeyChanged(bool pressed) OVERRIDE;	70 virtual void OnControlKeyChanged(bool pressed) OVERRIDE;

72 virtual bool CanCopy() OVERRIDE;	71 virtual bool CanCopy() OVERRIDE;

73 virtual void CopyToPasteboard(NSPasteboard* pboard) OVERRIDE;	72 virtual void CopyToPasteboard(NSPasteboard* pboard) OVERRIDE;

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
182 // Was the delete key pressed with an empty selection at the end of the edit?	181 // Was the delete key pressed with an empty selection at the end of the edit?

183 bool delete_at_end_pressed_;	182 bool delete_at_end_pressed_;

184	183

185 // The maximum/standard line height for the displayed text.	184 // The maximum/standard line height for the displayed text.

186 CGFloat line_height_;	185 CGFloat line_height_;

187	186

188 DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);	187 DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);

189 };	188 };

190	189

191 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_	190 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_

OLD	NEW