From c2dacc9ec41232903ba700c6aef5ef98bfcb8af8 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 16 Oct 2008 23:51:38 +0000 Subject: Rename ChromeViews namespace to views http://crbug.com/2188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3495 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/autocomplete/autocomplete_edit.cc | 4 ++-- chrome/browser/autocomplete/autocomplete_edit.h | 10 +++++----- chrome/browser/autocomplete/autocomplete_popup.cc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'chrome/browser/autocomplete') diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index e262e1a..09b2991 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -641,7 +641,7 @@ AutocompleteEditView::AutocompleteEditView( const ChromeFont& font, AutocompleteEditController* controller, ToolbarModel* toolbar_model, - ChromeViews::View* parent_view, + views::View* parent_view, HWND hwnd, Profile* profile, CommandController* command_controller, @@ -1113,7 +1113,7 @@ void AutocompleteEditView::PasteAndGo(const std::wstring& text) { } bool AutocompleteEditView::OverrideAccelerator( - const ChromeViews::Accelerator& accelerator) { + const views::Accelerator& accelerator) { // Only override . if ((accelerator.GetKeyCode() != VK_ESCAPE) || accelerator.IsAltDown()) return false; diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h index 35b75b7..15e3688 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.h +++ b/chrome/browser/autocomplete/autocomplete_edit.h @@ -24,7 +24,7 @@ class AutocompletePopupModel; class CommandController; class Profile; class TabContents; -namespace ChromeViews { +namespace views { class View; } @@ -467,7 +467,7 @@ class AutocompleteEditView AutocompleteEditView(const ChromeFont& font, AutocompleteEditController* controller, ToolbarModel* toolbar_model, - ChromeViews::View* parent_view, + views::View* parent_view, HWND hwnd, Profile* profile, CommandController* command_controller, @@ -477,7 +477,7 @@ class AutocompleteEditView AutocompleteEditModel* model() { return model_.get(); } const AutocompleteEditModel* model() const { return model_.get(); } - ChromeViews::View* parent_view() const { return parent_view_; } + views::View* parent_view() const { return parent_view_; } // For use when switching tabs, this saves the current state onto the tab so // that it can be restored during a later call to Update(). @@ -584,7 +584,7 @@ class AutocompleteEditView // Called before an accelerator is processed to give us a chance to override // it. - bool OverrideAccelerator(const ChromeViews::Accelerator& accelerator); + bool OverrideAccelerator(const views::Accelerator& accelerator); // Handler for external events passed in to us. The View that owns us may // send us events that we should treat as if they were events on us. @@ -804,7 +804,7 @@ class AutocompleteEditView // The parent view for the edit, used to align the popup and for // accessibility. - ChromeViews::View* parent_view_; + views::View* parent_view_; ToolbarModel* toolbar_model_; diff --git a/chrome/browser/autocomplete/autocomplete_popup.cc b/chrome/browser/autocomplete/autocomplete_popup.cc index c30bbb5..7f17572 100644 --- a/chrome/browser/autocomplete/autocomplete_popup.cc +++ b/chrome/browser/autocomplete/autocomplete_popup.cc @@ -173,7 +173,7 @@ void AutocompletePopupView::UpdatePopupAppearance() { // Subtract the top left corner to make the coordinates relative to the // location bar view itself, and convert to screen coordinates. gfx::Point top_left(-rc.TopLeft()); - ChromeViews::View::ConvertPointToScreen(edit_view_->parent_view(), &top_left); + views::View::ConvertPointToScreen(edit_view_->parent_view(), &top_left); rc.OffsetRect(top_left.ToPOINT()); // Expand by one pixel on each side since that's the amount the location bar // view is inset from the divider line that edges the adjacent buttons. -- cgit v1.1