| 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 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ |    5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ | 
|    6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ |    6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ | 
|    7 #pragma once |    7 #pragma once | 
|    8  |    8  | 
|    9 #include <atlbase.h> |    9 #include <atlbase.h> | 
|   10 #include <atlapp.h> |   10 #include <atlapp.h> | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   59     const CHARRANGE saved_selection_for_focus_change; |   59     const CHARRANGE saved_selection_for_focus_change; | 
|   60   }; |   60   }; | 
|   61  |   61  | 
|   62   DECLARE_WND_CLASS(L"Chrome_OmniboxView"); |   62   DECLARE_WND_CLASS(L"Chrome_OmniboxView"); | 
|   63  |   63  | 
|   64   OmniboxViewWin(AutocompleteEditController* controller, |   64   OmniboxViewWin(AutocompleteEditController* controller, | 
|   65                  ToolbarModel* toolbar_model, |   65                  ToolbarModel* toolbar_model, | 
|   66                  LocationBarView* parent_view, |   66                  LocationBarView* parent_view, | 
|   67                  CommandUpdater* command_updater, |   67                  CommandUpdater* command_updater, | 
|   68                  bool popup_window_mode, |   68                  bool popup_window_mode, | 
|   69                  views::View* location_bar); |   69                  views::View* location_bar, | 
 |   70                  views::View* popup_parent_view); | 
|   70   ~OmniboxViewWin(); |   71   ~OmniboxViewWin(); | 
|   71  |   72  | 
|   72   // Gets the relative window for the specified native view. |   73   // Gets the relative window for the specified native view. | 
|   73   static gfx::NativeView GetRelativeWindowForNativeView( |   74   static gfx::NativeView GetRelativeWindowForNativeView( | 
|   74       gfx::NativeView edit_native_view); |   75       gfx::NativeView edit_native_view); | 
|   75  |   76  | 
|   76   views::View* parent_view() const; |   77   views::View* parent_view() const; | 
|   77  |   78  | 
|   78   // OmniboxView: |   79   // OmniboxView: | 
|   79   virtual AutocompleteEditModel* model() OVERRIDE { return model_.get(); } |   80   virtual AutocompleteEditModel* model() OVERRIDE { return model_.get(); } | 
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  530   // Instance of accessibility information and handling. |  531   // Instance of accessibility information and handling. | 
|  531   mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_; |  532   mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_; | 
|  532  |  533  | 
|  533   // The native view host. |  534   // The native view host. | 
|  534   views::NativeViewHost* native_view_host_; |  535   views::NativeViewHost* native_view_host_; | 
|  535  |  536  | 
|  536   DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin); |  537   DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin); | 
|  537 }; |  538 }; | 
|  538  |  539  | 
|  539 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ |  540 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ | 
| OLD | NEW |