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

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

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 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
OLDNEW
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/string_util.h" 10 #include "base/string_util.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/autocomplete/autocomplete_input.h" 13 #include "chrome/browser/autocomplete/autocomplete_input.h"
14 #include "chrome/browser/autocomplete/autocomplete_match.h" 14 #include "chrome/browser/autocomplete/autocomplete_match.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/instant/search.h"
16 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/cocoa/event_utils.h" 18 #include "chrome/browser/ui/cocoa/event_utils.h"
18 #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" 19 #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" 20 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
20 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" 21 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
21 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" 22 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
22 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 23 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
23 #include "chrome/browser/ui/search/search.h"
24 #include "chrome/browser/ui/toolbar/toolbar_model.h" 24 #include "chrome/browser/ui/toolbar/toolbar_model.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
28 #import "third_party/mozilla/NSPasteboard+Utils.h" 28 #import "third_party/mozilla/NSPasteboard+Utils.h"
29 #include "ui/base/clipboard/clipboard.h" 29 #include "ui/base/clipboard/clipboard.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 #include "ui/gfx/rect.h" 31 #include "ui/gfx/rect.h"
32 32
33 using content::WebContents; 33 using content::WebContents;
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 976
977 NSUInteger OmniboxViewMac::GetTextLength() const { 977 NSUInteger OmniboxViewMac::GetTextLength() const {
978 return [field_ currentEditor] ? [[[field_ currentEditor] string] length] : 978 return [field_ currentEditor] ? [[[field_ currentEditor] string] length] :
979 [[field_ stringValue] length]; 979 [[field_ stringValue] length];
980 } 980 }
981 981
982 bool OmniboxViewMac::IsCaretAtEnd() const { 982 bool OmniboxViewMac::IsCaretAtEnd() const {
983 const NSRange selection = GetSelectedRange(); 983 const NSRange selection = GetSelectedRange();
984 return selection.length == 0 && selection.location == GetTextLength(); 984 return selection.length == 0 && selection.location == GetTextLength();
985 } 985 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698