chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm - Issue 447183003: Move OmniboxFieldTrial to components

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

Issue 447183003: Move OmniboxFieldTrial to components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase & fix switch indent Created 6 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

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 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"	5 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"

6	6

7 #include <Carbon/Carbon.h> // kVK_Return	7 #include <Carbon/Carbon.h> // kVK_Return

8	8

9 #include "base/mac/foundation_util.h"	9 #include "base/mac/foundation_util.h"

10 #include "base/metrics/histogram.h"	10 #include "base/metrics/histogram.h"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

12 #include "base/strings/sys_string_conversions.h"	12 #include "base/strings/sys_string_conversions.h"

13 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"	14 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"

15 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/omnibox/omnibox_field_trial.h"

17 #include "chrome/browser/search/search.h"	16 #include "chrome/browser/search/search.h"

18 #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"	17 #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"

19 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"	18 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"

20 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"	19 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"

21 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"	20 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"

22 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"	21 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"

23 #include "chrome/browser/ui/toolbar/toolbar_model.h"	22 #include "chrome/browser/ui/toolbar/toolbar_model.h"

24 #include "components/omnibox/autocomplete_input.h"	23 #include "components/omnibox/autocomplete_input.h"

25 #include "components/omnibox/autocomplete_match.h"	24 #include "components/omnibox/autocomplete_match.h"

	25 #include "components/omnibox/omnibox_field_trial.h"

26 #include "content/public/browser/web_contents.h"	26 #include "content/public/browser/web_contents.h"

27 #include "extensions/common/constants.h"	27 #include "extensions/common/constants.h"

28 #include "grit/generated_resources.h"	28 #include "grit/generated_resources.h"

29 #include "grit/theme_resources.h"	29 #include "grit/theme_resources.h"

30 #import "third_party/mozilla/NSPasteboard+Utils.h"	30 #import "third_party/mozilla/NSPasteboard+Utils.h"

31 #include "ui/base/clipboard/clipboard.h"	31 #include "ui/base/clipboard/clipboard.h"

32 #import "ui/base/cocoa/cocoa_base_utils.h"	32 #import "ui/base/cocoa/cocoa_base_utils.h"

33 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

34 #include "ui/gfx/font.h"	34 #include "ui/gfx/font.h"

35 #include "ui/gfx/font_list.h"	35 #include "ui/gfx/font_list.h"

(...skipping 986 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1022	1022

1023 NSUInteger OmniboxViewMac::GetTextLength() const {	1023 NSUInteger OmniboxViewMac::GetTextLength() const {

1024 return [field_ currentEditor] ? [[[field_ currentEditor] string] length] :	1024 return [field_ currentEditor] ? [[[field_ currentEditor] string] length] :

1025 [[field_ stringValue] length];	1025 [[field_ stringValue] length];

1026 }	1026 }

1027	1027

1028 bool OmniboxViewMac::IsCaretAtEnd() const {	1028 bool OmniboxViewMac::IsCaretAtEnd() const {

1029 const NSRange selection = GetSelectedRange();	1029 const NSRange selection = GetSelectedRange();

1030 return NSMaxRange(selection) == GetTextLength();	1030 return NSMaxRange(selection) == GetTextLength();

1031 }	1031 }

OLD	NEW