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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/autocomplete/autocomplete_edit.h" 11 #include "chrome/browser/autocomplete/autocomplete_edit.h"
12 #include "chrome/browser/autocomplete/autocomplete_match.h" 12 #include "chrome/browser/autocomplete/autocomplete_match.h"
13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
14 #include "chrome/browser/command_updater.h" 14 #include "chrome/browser/command_updater.h"
15 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h" 15 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h"
16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 16 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
17 #include "chrome/common/chrome_notification_types.h" 17 #include "chrome/common/chrome_notification_types.h"
18 #include "content/browser/tab_contents/tab_contents.h" 18 #include "content/browser/tab_contents/tab_contents.h"
19 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "net/base/escape.h" 21 #include "net/base/escape.h"
22 #include "third_party/skia/include/core/SkColor.h" 22 #include "third_party/skia/include/core/SkColor.h"
23 #include "ui/base/accessibility/accessible_view_state.h" 23 #include "ui/base/accessibility/accessible_view_state.h"
24 #include "ui/base/dragdrop/drag_drop_types.h" 24 #include "ui/base/dragdrop/drag_drop_types.h"
25 #include "ui/base/ime/text_input_type.h" 25 #include "ui/base/ime/text_input_type.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/gfx/font.h" 28 #include "ui/gfx/font.h"
29 #include "ui/gfx/render_text.h" 29 #include "ui/gfx/render_text.h"
30 #include "ui/views/border.h"
30 #include "ui/views/controls/textfield/textfield.h" 31 #include "ui/views/controls/textfield/textfield.h"
31 #include "ui/views/events/event.h" 32 #include "ui/views/events/event.h"
32 #include "ui/views/layout/fill_layout.h" 33 #include "ui/views/layout/fill_layout.h"
33 #include "views/border.h"
34 34
35 #if defined(OS_WIN) 35 #if defined(OS_WIN)
36 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" 36 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
37 #endif 37 #endif
38 38
39 namespace { 39 namespace {
40 40
41 // Textfield for autocomplete that intercepts events that are necessary 41 // Textfield for autocomplete that intercepts events that are necessary
42 // for OmniboxViewViews. 42 // for OmniboxViewViews.
43 class AutocompleteTextfield : public views::Textfield { 43 class AutocompleteTextfield : public views::Textfield {
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller, 739 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller,
740 toolbar_model, 740 toolbar_model,
741 profile, 741 profile,
742 command_updater, 742 command_updater,
743 popup_window_mode, 743 popup_window_mode,
744 location_bar); 744 location_bar);
745 omnibox_view->Init(); 745 omnibox_view->Init();
746 return omnibox_view; 746 return omnibox_view;
747 } 747 }
748 #endif 748 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698