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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 7841012: Get chrome to link with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.h
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.h (revision 99983)
+++ chrome/browser/ui/views/location_bar/location_bar_view.h (working copy)
@@ -190,7 +190,7 @@
// in the toolbar in full keyboard accessibility mode.
virtual void SelectAll();
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Event Handlers
virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
@@ -321,16 +321,20 @@
void ToggleVisibility(bool new_vis, views::View* view);
#if defined(OS_WIN)
+#if !defined(USE_AURA)
// Helper for the Mouse event handlers that does all the real work.
void OnMouseEvent(const views::MouseEvent& event, UINT msg);
+#endif
// Returns true if the suggest text is valid.
bool HasValidSuggestText() const;
+#if !defined(USE_AURA)
// Returns |location_entry_| cast to OmniboxViewWin, or NULL if
// |location_entry_| is of a different type.
OmniboxViewWin* GetOmniboxViewWin();
#endif
+#endif
// Helper to show the first run info bubble.
void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698