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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.h

Issue 15745031: Restyle omnibox popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Go back to 3 max search suggestions for now Created 7 years, 6 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 | Annotate | Revision Log
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 #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 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 const CHARRANGE saved_selection_for_focus_change; 56 const CHARRANGE saved_selection_for_focus_change;
57 }; 57 };
58 58
59 DECLARE_WND_SUPERCLASS(L"Chrome_OmniboxView", MSFTEDIT_CLASS); 59 DECLARE_WND_SUPERCLASS(L"Chrome_OmniboxView", MSFTEDIT_CLASS);
60 60
61 OmniboxViewWin(OmniboxEditController* controller, 61 OmniboxViewWin(OmniboxEditController* controller,
62 ToolbarModel* toolbar_model, 62 ToolbarModel* toolbar_model,
63 LocationBarView* parent_view, 63 LocationBarView* parent_view,
64 CommandUpdater* command_updater, 64 CommandUpdater* command_updater,
65 bool popup_window_mode, 65 bool popup_window_mode,
66 views::View* location_bar,
67 const gfx::Font& font, 66 const gfx::Font& font,
68 int font_y_offset); 67 int font_y_offset);
69 ~OmniboxViewWin(); 68 ~OmniboxViewWin();
70 69
71 // Gets the relative window for the specified native view. 70 // Gets the relative window for the specified native view.
72 static gfx::NativeView GetRelativeWindowForNativeView( 71 static gfx::NativeView GetRelativeWindowForNativeView(
73 gfx::NativeView edit_native_view); 72 gfx::NativeView edit_native_view);
74 73
75 views::View* parent_view() const; 74 views::View* parent_view() const;
76 75
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 397
399 // The handle to the RichEdit DLL. In the rare case where the user's system 398 // The handle to the RichEdit DLL. In the rare case where the user's system
400 // is missing this DLL (due to some kind of system corruption), the similar 399 // is missing this DLL (due to some kind of system corruption), the similar
401 // OmniboxViewViews is used instead; see Textfield::IsViewsTextfieldEnabled(). 400 // OmniboxViewViews is used instead; see Textfield::IsViewsTextfieldEnabled().
402 static HMODULE loaded_library_module_; 401 static HMODULE loaded_library_module_;
403 402
404 scoped_ptr<OmniboxPopupView> popup_view_; 403 scoped_ptr<OmniboxPopupView> popup_view_;
405 404
406 // The parent view for the edit, used to align the popup and for 405 // The parent view for the edit, used to align the popup and for
407 // accessibility. 406 // accessibility.
408 LocationBarView* parent_view_; 407 LocationBarView* location_bar_;
409 408
410 // When true, the location bar view is read only and also is has a slightly 409 // When true, the location bar view is read only and also is has a slightly
411 // different presentation (font size / color). This is used for popups. 410 // different presentation (font size / color). This is used for popups.
412 bool popup_window_mode_; 411 bool popup_window_mode_;
413 412
414 // True if we should prevent attempts to make the window visible when we 413 // True if we should prevent attempts to make the window visible when we
415 // handle WM_WINDOWPOSCHANGING. While toggling fullscreen mode, the main 414 // handle WM_WINDOWPOSCHANGING. While toggling fullscreen mode, the main
416 // window is hidden, and if the edit is shown it will draw over the main 415 // window is hidden, and if the edit is shown it will draw over the main
417 // window when that window reappears. 416 // window when that window reappears.
418 bool force_hidden_; 417 bool force_hidden_;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 // The native view host. 517 // The native view host.
519 views::NativeViewHost* native_view_host_; 518 views::NativeViewHost* native_view_host_;
520 519
521 // TSF related event router. 520 // TSF related event router.
522 scoped_ptr<ui::TSFEventRouter> tsf_event_router_; 521 scoped_ptr<ui::TSFEventRouter> tsf_event_router_;
523 522
524 DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin); 523 DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
525 }; 524 };
526 525
527 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_ 526 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698