views: Move AutocompleteEditViewViews/autocomplete_edit_view_views.* to ui/views/omnibox directory.
- Rename AutocompleteEditViewViews to OmniboxViewViews.
- Move autocomplete_edit_view_views.* to omnibox_view_views.*
BUG=80186
TEST=None
[email protected]
Review URL: http://codereview.chromium.org/6904130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83801 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
index adbb1e8..e1c1251 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
@@ -1375,7 +1375,7 @@
}
// TODO(suzhe): This test is broken because of broken ViewID support when
-// enabling AutocompleteEditViewViews.
+// enabling OmniboxViewViews.
IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest,
DISABLED_TabMoveCursorToEnd) {
TabMoveCursorToEndTest();
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index 7843277..89989f5 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -40,9 +40,9 @@
#include "ui/gfx/skia_utils_gtk.h"
#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/autocomplete/autocomplete_edit_view_views.h"
#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
#include "views/controls/textfield/native_textfield_views.h"
#include "views/events/event.h"
#else
@@ -885,33 +885,31 @@
bool popup_window_mode,
views::View* location_bar) {
if (views::NativeTextfieldViews::IsTextfieldViewsEnabled()) {
- AutocompleteEditViewViews* autocomplete =
- new AutocompleteEditViewViews(controller,
- toolbar_model,
- profile,
- command_updater,
- popup_window_mode,
- location_bar);
- autocomplete->Init();
- return autocomplete;
+ OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller,
+ toolbar_model,
+ profile,
+ command_updater,
+ popup_window_mode,
+ location_bar);
+ omnibox_view->Init();
+ return omnibox_view;
}
- OmniboxViewGtk* autocomplete = new OmniboxViewGtk(controller,
+ OmniboxViewGtk* omnibox_view = new OmniboxViewGtk(controller,
toolbar_model,
profile,
command_updater,
popup_window_mode,
location_bar);
- autocomplete->Init();
+ omnibox_view->Init();
// Make all the children of the widget visible. NOTE: this won't display
// anything, it just toggles the visible flag.
- gtk_widget_show_all(autocomplete->GetNativeView());
- // Hide the widget. NativeViewHostGtk will make it visible again as
- // necessary.
- gtk_widget_hide(autocomplete->GetNativeView());
+ gtk_widget_show_all(omnibox_view->GetNativeView());
+ // Hide the widget. NativeViewHostGtk will make it visible again as necessary.
+ gtk_widget_hide(omnibox_view->GetNativeView());
- return autocomplete;
+ return omnibox_view;
}
#endif
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
index cbda4c76..345e199 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
@@ -151,8 +151,8 @@
// A factory method to create an AutocompleteEditView instance initialized for
// linux_views. This currently returns an instance of OmniboxViewGtk only,
- // but AutocompleteEditViewViews will be added as an option when
- // TextfieldViews is enabled.
+ // but OmniboxViewViews will be added as an option when TextfieldViews is
+ // enabled.
static AutocompleteEditView* Create(AutocompleteEditController* controller,
ToolbarModel* toolbar_model,
Profile* profile,
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
similarity index 74%
rename from chrome/browser/autocomplete/autocomplete_edit_view_views.cc
rename to chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 89d6617..5d0f4a11 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/autocomplete/autocomplete_edit_view_views.h"
+#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
#include "base/logging.h"
#include "base/string_util.h"
@@ -32,36 +32,34 @@
namespace {
// Textfield for autocomplete that intercepts events that are necessary
-// for AutocompleteEditViewViews.
+// for OmniboxViewViews.
class AutocompleteTextfield : public views::Textfield {
public:
- explicit AutocompleteTextfield(
- AutocompleteEditViewViews* autocomplete_edit_view)
+ explicit AutocompleteTextfield(OmniboxViewViews* omnibox_view)
: views::Textfield(views::Textfield::STYLE_DEFAULT),
- autocomplete_edit_view_(autocomplete_edit_view) {
- DCHECK(autocomplete_edit_view_);
+ omnibox_view_(omnibox_view) {
+ DCHECK(omnibox_view_);
RemoveBorder();
}
// views::View implementation
virtual void OnFocus() OVERRIDE {
views::Textfield::OnFocus();
- autocomplete_edit_view_->HandleFocusIn();
+ omnibox_view_->HandleFocusIn();
}
virtual void OnBlur() OVERRIDE {
views::Textfield::OnBlur();
- autocomplete_edit_view_->HandleFocusOut();
+ omnibox_view_->HandleFocusOut();
}
virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE {
bool handled = views::Textfield::OnKeyPressed(event);
- return autocomplete_edit_view_->HandleAfterKeyEvent(event, handled) ||
- handled;
+ return omnibox_view_->HandleAfterKeyEvent(event, handled) || handled;
}
virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE {
- return autocomplete_edit_view_->HandleKeyReleaseEvent(event);
+ return omnibox_view_->HandleKeyReleaseEvent(event);
}
virtual bool IsFocusable() const OVERRIDE {
@@ -71,7 +69,7 @@
}
private:
- AutocompleteEditViewViews* autocomplete_edit_view_;
+ OmniboxViewViews* omnibox_view_;
DISALLOW_COPY_AND_ASSIGN(AutocompleteTextfield);
};
@@ -108,13 +106,12 @@
} // namespace
-AutocompleteEditViewViews::AutocompleteEditViewViews(
- AutocompleteEditController* controller,
- ToolbarModel* toolbar_model,
- Profile* profile,
- CommandUpdater* command_updater,
- bool popup_window_mode,
- const views::View* location_bar)
+OmniboxViewViews::OmniboxViewViews(AutocompleteEditController* controller,
+ ToolbarModel* toolbar_model,
+ Profile* profile,
+ CommandUpdater* command_updater,
+ bool popup_window_mode,
+ const views::View* location_bar)
: model_(new AutocompleteEditModel(this, controller, profile)),
popup_view_(CreatePopupView(profile, location_bar)),
controller_(controller),
@@ -128,10 +125,10 @@
kAutocompleteVerticalMargin, 0));
}
-AutocompleteEditViewViews::~AutocompleteEditViewViews() {
+OmniboxViewViews::~OmniboxViewViews() {
NotificationService::current()->Notify(
NotificationType::AUTOCOMPLETE_EDIT_DESTROYED,
- Source<AutocompleteEditViewViews>(this),
+ Source<OmniboxViewViews>(this),
NotificationService::NoDetails());
// Explicitly teardown members which have a reference to us. Just to be safe
// we want them to be destroyed before destroying any other internal state.
@@ -140,9 +137,9 @@
}
////////////////////////////////////////////////////////////////////////////////
-// AutocompleteEditViewViews public:
+// OmniboxViewViews public:
-void AutocompleteEditViewViews::Init() {
+void OmniboxViewViews::Init() {
// The height of the text view is going to change based on the font used. We
// don't want to stretch the height, and we want it vertically centered.
// TODO(oshima): make sure the above happens with views.
@@ -162,14 +159,13 @@
SetBaseColor();
}
-void AutocompleteEditViewViews::SetBaseColor() {
+void OmniboxViewViews::SetBaseColor() {
// TODO(oshima): Implment style change.
NOTIMPLEMENTED();
}
-bool AutocompleteEditViewViews::HandleAfterKeyEvent(
- const views::KeyEvent& event,
- bool handled) {
+bool OmniboxViewViews::HandleAfterKeyEvent(const views::KeyEvent& event,
+ bool handled) {
if (event.key_code() == ui::VKEY_RETURN) {
bool alt_held = event.IsAltDown();
model_->AcceptInput(alt_held ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
@@ -223,8 +219,7 @@
return handled;
}
-bool AutocompleteEditViewViews::HandleKeyReleaseEvent(
- const views::KeyEvent& event) {
+bool OmniboxViewViews::HandleKeyReleaseEvent(const views::KeyEvent& event) {
// Omnibox2 can switch its contents while pressing a control key. To switch
// the contents of omnibox2, we notify the AutocompleteEditModel class when
// the control-key state is changed.
@@ -237,14 +232,14 @@
return false;
}
-void AutocompleteEditViewViews::HandleFocusIn() {
+void OmniboxViewViews::HandleFocusIn() {
// TODO(oshima): Get control key state.
model_->OnSetFocus(false);
// Don't call controller_->OnSetFocus as this view has already
// acquired the focus.
}
-void AutocompleteEditViewViews::HandleFocusOut() {
+void OmniboxViewViews::HandleFocusOut() {
// TODO(oshima): we don't have native view. This requires
// further refactoring.
model_->OnWillKillFocus(NULL);
@@ -256,31 +251,30 @@
}
////////////////////////////////////////////////////////////////////////////////
-// AutocompleteEditViewViews, views::View implementation:
-void AutocompleteEditViewViews::Layout() {
+// OmniboxViewViews, views::View implementation:
+void OmniboxViewViews::Layout() {
gfx::Insets insets = GetInsets();
textfield_->SetBounds(insets.left(), insets.top(),
width() - insets.width(),
height() - insets.height());
}
-void AutocompleteEditViewViews::GetAccessibleState(
- ui::AccessibleViewState* state) {
+void OmniboxViewViews::GetAccessibleState(ui::AccessibleViewState* state) {
state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
}
////////////////////////////////////////////////////////////////////////////////
-// AutocompleteEditViewViews, AutocopmleteEditView implementation:
+// OmniboxViewViews, AutocopmleteEditView implementation:
-AutocompleteEditModel* AutocompleteEditViewViews::model() {
+AutocompleteEditModel* OmniboxViewViews::model() {
return model_.get();
}
-const AutocompleteEditModel* AutocompleteEditViewViews::model() const {
+const AutocompleteEditModel* OmniboxViewViews::model() const {
return model_.get();
}
-void AutocompleteEditViewViews::SaveStateToTab(TabContents* tab) {
+void OmniboxViewViews::SaveStateToTab(TabContents* tab) {
DCHECK(tab);
// NOTE: GetStateForTabSwitch may affect GetSelection, so order is important.
@@ -292,7 +286,7 @@
AutocompleteEditState(model_state, ViewState(selection)));
}
-void AutocompleteEditViewViews::Update(const TabContents* contents) {
+void OmniboxViewViews::Update(const TabContents* contents) {
// NOTE: We're getting the URL text here from the ToolbarModel.
bool visibly_changed_permanent_text =
model_->UpdatePermanentText(WideToUTF16Hack(toolbar_model_->GetText()));
@@ -323,12 +317,12 @@
}
}
-void AutocompleteEditViewViews::OpenURL(const GURL& url,
- WindowOpenDisposition disposition,
- PageTransition::Type transition,
- const GURL& alternate_nav_url,
- size_t selected_line,
- const string16& keyword) {
+void OmniboxViewViews::OpenURL(const GURL& url,
+ WindowOpenDisposition disposition,
+ PageTransition::Type transition,
+ const GURL& alternate_nav_url,
+ size_t selected_line,
+ const string16& keyword) {
if (!url.is_valid())
return;
@@ -336,28 +330,28 @@
selected_line, keyword);
}
-string16 AutocompleteEditViewViews::GetText() const {
+string16 OmniboxViewViews::GetText() const {
// TODO(oshima): IME support
return textfield_->text();
}
-bool AutocompleteEditViewViews::IsEditingOrEmpty() const {
+bool OmniboxViewViews::IsEditingOrEmpty() const {
return model_->user_input_in_progress() || (GetTextLength() == 0);
}
-int AutocompleteEditViewViews::GetIcon() const {
+int OmniboxViewViews::GetIcon() const {
return IsEditingOrEmpty() ?
AutocompleteMatch::TypeToIcon(model_->CurrentTextType()) :
toolbar_model_->GetIcon();
}
-void AutocompleteEditViewViews::SetUserText(const string16& text) {
+void OmniboxViewViews::SetUserText(const string16& text) {
SetUserText(text, text, true);
}
-void AutocompleteEditViewViews::SetUserText(const string16& text,
- const string16& display_text,
- bool update_popup) {
+void OmniboxViewViews::SetUserText(const string16& text,
+ const string16& display_text,
+ bool update_popup) {
model_->SetUserText(text);
SetWindowTextAndCaretPos(display_text, display_text.length());
if (update_popup)
@@ -365,14 +359,13 @@
TextChanged();
}
-void AutocompleteEditViewViews::SetWindowTextAndCaretPos(
- const string16& text,
- size_t caret_pos) {
+void OmniboxViewViews::SetWindowTextAndCaretPos(const string16& text,
+ size_t caret_pos) {
const ui::Range range(caret_pos, caret_pos);
SetTextAndSelectedRange(text, range);
}
-void AutocompleteEditViewViews::SetForcedQuery() {
+void OmniboxViewViews::SetForcedQuery() {
const string16 current_text(GetText());
const size_t start = current_text.find_first_not_of(kWhitespaceUTF16);
if (start == string16::npos || (current_text[start] != '?')) {
@@ -382,38 +375,37 @@
}
}
-bool AutocompleteEditViewViews::IsSelectAll() {
+bool OmniboxViewViews::IsSelectAll() {
// TODO(oshima): IME support.
return textfield_->text() == textfield_->GetSelectedText();
}
-bool AutocompleteEditViewViews::DeleteAtEndPressed() {
+bool OmniboxViewViews::DeleteAtEndPressed() {
return delete_at_end_pressed_;
}
-void AutocompleteEditViewViews::GetSelectionBounds(
- string16::size_type* start,
- string16::size_type* end) {
+void OmniboxViewViews::GetSelectionBounds(string16::size_type* start,
+ string16::size_type* end) {
ui::Range range;
textfield_->GetSelectedRange(&range);
*start = static_cast<size_t>(range.end());
*end = static_cast<size_t>(range.start());
}
-void AutocompleteEditViewViews::SelectAll(bool reversed) {
+void OmniboxViewViews::SelectAll(bool reversed) {
if (reversed)
SelectRange(GetTextLength(), 0);
else
SelectRange(0, GetTextLength());
}
-void AutocompleteEditViewViews::RevertAll() {
+void OmniboxViewViews::RevertAll() {
ClosePopup();
model_->Revert();
TextChanged();
}
-void AutocompleteEditViewViews::UpdatePopup() {
+void OmniboxViewViews::UpdatePopup() {
model_->SetInputInProgress(true);
if (!model_->has_focus())
return;
@@ -428,17 +420,17 @@
model_->StartAutocomplete(!sel.is_empty(), no_inline_autocomplete);
}
-void AutocompleteEditViewViews::ClosePopup() {
+void OmniboxViewViews::ClosePopup() {
model_->StopAutocomplete();
}
-void AutocompleteEditViewViews::SetFocus() {
+void OmniboxViewViews::SetFocus() {
// In views-implementation, the focus is on textfield rather than
// AutocompleteEditView.
textfield_->RequestFocus();
}
-void AutocompleteEditViewViews::OnTemporaryTextMaybeChanged(
+void OmniboxViewViews::OnTemporaryTextMaybeChanged(
const string16& display_text,
bool save_original_selection) {
if (save_original_selection)
@@ -448,7 +440,7 @@
TextChanged();
}
-bool AutocompleteEditViewViews::OnInlineAutocompleteTextMaybeChanged(
+bool OmniboxViewViews::OnInlineAutocompleteTextMaybeChanged(
const string16& display_text,
size_t user_text_length) {
if (display_text == GetText())
@@ -459,19 +451,19 @@
return true;
}
-void AutocompleteEditViewViews::OnRevertTemporaryText() {
+void OmniboxViewViews::OnRevertTemporaryText() {
textfield_->SelectRange(saved_temporary_selection_);
TextChanged();
}
-void AutocompleteEditViewViews::OnBeforePossibleChange() {
+void OmniboxViewViews::OnBeforePossibleChange() {
// Record our state.
text_before_change_ = GetText();
textfield_->GetSelectedRange(&sel_before_change_);
ime_composing_before_change_ = textfield_->IsIMEComposing();
}
-bool AutocompleteEditViewViews::OnAfterPossibleChange() {
+bool OmniboxViewViews::OnAfterPossibleChange() {
ui::Range new_sel;
textfield_->GetSelectedRange(&new_sel);
@@ -510,65 +502,63 @@
return something_changed;
}
-gfx::NativeView AutocompleteEditViewViews::GetNativeView() const {
+gfx::NativeView OmniboxViewViews::GetNativeView() const {
return GetWidget()->GetNativeView();
}
-CommandUpdater* AutocompleteEditViewViews::GetCommandUpdater() {
+CommandUpdater* OmniboxViewViews::GetCommandUpdater() {
return command_updater_;
}
-void AutocompleteEditViewViews::SetInstantSuggestion(const string16& input,
- bool animate_to_complete) {
+void OmniboxViewViews::SetInstantSuggestion(const string16& input,
+ bool animate_to_complete) {
NOTIMPLEMENTED();
}
-string16 AutocompleteEditViewViews::GetInstantSuggestion() const {
+string16 OmniboxViewViews::GetInstantSuggestion() const {
NOTIMPLEMENTED();
return string16();
}
-int AutocompleteEditViewViews::TextWidth() const {
+int OmniboxViewViews::TextWidth() const {
// TODO(oshima): add horizontal margin.
return textfield_->font().GetStringWidth(textfield_->text());
}
-bool AutocompleteEditViewViews::IsImeComposing() const {
+bool OmniboxViewViews::IsImeComposing() const {
return false;
}
-views::View* AutocompleteEditViewViews::AddToView(views::View* parent) {
+views::View* OmniboxViewViews::AddToView(views::View* parent) {
parent->AddChildView(this);
AddChildView(textfield_);
return this;
}
-int AutocompleteEditViewViews::OnPerformDrop(
- const views::DropTargetEvent& event) {
+int OmniboxViewViews::OnPerformDrop(const views::DropTargetEvent& event) {
NOTIMPLEMENTED();
return ui::DragDropTypes::DRAG_NONE;
}
////////////////////////////////////////////////////////////////////////////////
-// AutocompleteEditViewViews, NotificationObserver implementation:
+// OmniboxViewViews, NotificationObserver implementation:
-void AutocompleteEditViewViews::Observe(NotificationType type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void OmniboxViewViews::Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details) {
DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
SetBaseColor();
}
////////////////////////////////////////////////////////////////////////////////
-// AutocompleteEditViewViews, views::TextfieldController implementation:
+// OmniboxViewViews, views::TextfieldController implementation:
-void AutocompleteEditViewViews::ContentsChanged(views::Textfield* sender,
- const string16& new_contents) {
+void OmniboxViewViews::ContentsChanged(views::Textfield* sender,
+ const string16& new_contents) {
}
-bool AutocompleteEditViewViews::HandleKeyEvent(
- views::Textfield* textfield,
- const views::KeyEvent& event) {
+bool OmniboxViewViews::HandleKeyEvent(views::Textfield* textfield,
+ const views::KeyEvent& event) {
delete_at_end_pressed_ = false;
if (event.key_code() == ui::VKEY_BACK) {
@@ -594,51 +584,50 @@
return false;
}
-void AutocompleteEditViewViews::OnBeforeUserAction(views::Textfield* sender) {
+void OmniboxViewViews::OnBeforeUserAction(views::Textfield* sender) {
OnBeforePossibleChange();
}
-void AutocompleteEditViewViews::OnAfterUserAction(views::Textfield* sender) {
+void OmniboxViewViews::OnAfterUserAction(views::Textfield* sender) {
OnAfterPossibleChange();
}
////////////////////////////////////////////////////////////////////////////////
-// AutocompleteEditViewViews, private:
+// OmniboxViewViews, private:
-size_t AutocompleteEditViewViews::GetTextLength() const {
+size_t OmniboxViewViews::GetTextLength() const {
// TODO(oshima): Support instant, IME.
return textfield_->text().length();
}
-void AutocompleteEditViewViews::EmphasizeURLComponents() {
+void OmniboxViewViews::EmphasizeURLComponents() {
// TODO(oshima): Update URL visual style
NOTIMPLEMENTED();
}
-void AutocompleteEditViewViews::TextChanged() {
+void OmniboxViewViews::TextChanged() {
EmphasizeURLComponents();
model_->OnChanged();
}
-void AutocompleteEditViewViews::SetTextAndSelectedRange(
- const string16& text,
- const ui::Range& range) {
+void OmniboxViewViews::SetTextAndSelectedRange(const string16& text,
+ const ui::Range& range) {
if (text != GetText())
textfield_->SetText(text);
textfield_->SelectRange(range);
}
-string16 AutocompleteEditViewViews::GetSelectedText() const {
+string16 OmniboxViewViews::GetSelectedText() const {
// TODO(oshima): Support instant, IME.
return textfield_->GetSelectedText();
}
-void AutocompleteEditViewViews::SelectRange(size_t caret, size_t end) {
+void OmniboxViewViews::SelectRange(size_t caret, size_t end) {
const ui::Range range(caret, end);
textfield_->SelectRange(range);
}
-AutocompletePopupView* AutocompleteEditViewViews::CreatePopupView(
+AutocompletePopupView* OmniboxViewViews::CreatePopupView(
Profile* profile,
const View* location_bar) {
#if defined(TOUCH_UI)
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
similarity index 87%
rename from chrome/browser/autocomplete/autocomplete_edit_view_views.h
rename to chrome/browser/ui/views/omnibox/omnibox_view_views.h
index 5771329..7fdf5e0 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_VIEWS_H_
-#define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_VIEWS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
#pragma once
#include <string>
@@ -36,18 +36,18 @@
// URL styles (strikestrough insecure scheme, emphasize host).
// Custom context menu for omnibox.
// Instant.
-class AutocompleteEditViewViews : public views::View,
- public AutocompleteEditView,
- public NotificationObserver,
- public views::TextfieldController {
+class OmniboxViewViews : public views::View,
+ public AutocompleteEditView,
+ public NotificationObserver,
+ public views::TextfieldController {
public:
- AutocompleteEditViewViews(AutocompleteEditController* controller,
- ToolbarModel* toolbar_model,
- Profile* profile,
- CommandUpdater* command_updater,
- bool popup_window_mode,
- const views::View* location_bar);
- virtual ~AutocompleteEditViewViews();
+ OmniboxViewViews(AutocompleteEditController* controller,
+ ToolbarModel* toolbar_model,
+ Profile* profile,
+ CommandUpdater* command_updater,
+ bool popup_window_mode,
+ const views::View* location_bar);
+ virtual ~OmniboxViewViews();
// Initialize, create the underlying views, etc;
void Init();
@@ -187,7 +187,7 @@
// Was the delete key pressed with an empty selection at the end of the edit?
bool delete_at_end_pressed_;
- DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewViews);
+ DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
};
-#endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_VIEWS_H_
+#endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 73c9c4c..303d5ba 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -109,8 +109,6 @@
'browser/autocomplete/autocomplete_edit.cc',
'browser/autocomplete/autocomplete_edit.h',
'browser/autocomplete/autocomplete_edit_view.h',
- 'browser/autocomplete/autocomplete_edit_view_views.cc',
- 'browser/autocomplete/autocomplete_edit_view_views.h',
'browser/autocomplete/autocomplete_match.cc',
'browser/autocomplete/autocomplete_match.h',
'browser/autocomplete/autocomplete_popup_model.cc',
@@ -3078,6 +3076,8 @@
'browser/ui/views/notifications/balloon_view.h',
'browser/ui/views/notifications/balloon_view_host.cc',
'browser/ui/views/notifications/balloon_view_host.h',
+ 'browser/ui/views/omnibox/omnibox_view_views.cc',
+ 'browser/ui/views/omnibox/omnibox_view_views.h',
'browser/ui/views/omnibox/omnibox_view_win.cc',
'browser/ui/views/omnibox/omnibox_view_win.h',
'browser/ui/views/page_info_bubble_view.cc',
@@ -4076,6 +4076,8 @@
['include', '^browser/ui/views/location_bar_view.h'],
['include', '^browser/ui/views/notifications/balloon_view_host.cc'],
['include', '^browser/ui/views/notifications/balloon_view_host.h'],
+ ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
+ ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
['include', '^browser/ui/views/page_info_bubble_view.cc'],
['include', '^browser/ui/views/panel_controller.cc'],
['include', '^browser/ui/views/panel_controller.h'],
@@ -4245,6 +4247,8 @@
['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.cc'],
['include', '^browser/ui/gtk/omnibox/omnibox_view_gtk.h'],
['include', '^browser/ui/login/login_prompt_ui.cc'],
+ ['include', '^browser/ui/views/omnibox/omnibox_view_views.cc'],
+ ['include', '^browser/ui/views/omnibox/omnibox_view_views.h'],
['exclude', '^browser/extensions/extension_tts_api_linux.cc'],
['exclude', '^browser/notifications/balloon_collection_impl.cc'],
['exclude', '^browser/notifications/balloon_collection_impl.h'],
