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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix GdkEvent init, NativeWidgetGtk casting, and Get[Unmodified]Character checks. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 979 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, 990 chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
991 Source<ExtensionAction>(action), 991 Source<ExtensionAction>(action),
992 Details<TabContents>(contents)); 992 Details<TabContents>(contents));
993 } 993 }
994 } 994 }
995 } 995 }
996 } 996 }
997 997
998 #if defined(OS_WIN) && !defined(USE_AURA) 998 #if defined(OS_WIN) && !defined(USE_AURA)
999 void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) { 999 void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) {
1000 UINT flags = event.GetWindowsFlags(); 1000 UINT flags = event.native_event().wParam;
1001 gfx::Point screen_point(event.location()); 1001 gfx::Point screen_point(event.location());
1002 ConvertPointToScreen(this, &screen_point); 1002 ConvertPointToScreen(this, &screen_point);
1003 if (views::Widget::IsPureViews()) 1003 if (views::Widget::IsPureViews())
1004 NOTIMPLEMENTED(); 1004 NOTIMPLEMENTED();
1005 else 1005 else
1006 GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT()); 1006 GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
1007 } 1007 }
1008 #endif 1008 #endif
1009 1009
1010 void LocationBarView::ShowFirstRunBubbleInternal( 1010 void LocationBarView::ShowFirstRunBubbleInternal(
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 !suggested_text_view_->GetText().empty(); 1263 !suggested_text_view_->GetText().empty();
1264 } 1264 }
1265 1265
1266 #if !defined(USE_AURA) 1266 #if !defined(USE_AURA)
1267 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() { 1267 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
1268 CHECK(!views::Widget::IsPureViews()); 1268 CHECK(!views::Widget::IsPureViews());
1269 return static_cast<OmniboxViewWin*>(location_entry_.get()); 1269 return static_cast<OmniboxViewWin*>(location_entry_.get());
1270 } 1270 }
1271 #endif 1271 #endif
1272 #endif 1272 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698