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

Unified Diff: chrome/browser/ui/views/frame/browser_root_view.cc

Issue 6480001: Migrate Event API methods to Google Style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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/frame/browser_root_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_root_view.cc (revision 74326)
+++ chrome/browser/ui/views/frame/browser_root_view.cc (working copy)
@@ -56,7 +56,7 @@
if (ShouldForwardToTabStrip(event)) {
forwarding_to_tab_strip_ = true;
scoped_ptr<views::DropTargetEvent> mapped_event(
- MapEventToTabStrip(event, event.GetData()));
+ MapEventToTabStrip(event, event.data()));
tabstrip()->OnDragEntered(*mapped_event.get());
}
}
@@ -64,7 +64,7 @@
int BrowserRootView::OnDragUpdated(const views::DropTargetEvent& event) {
if (ShouldForwardToTabStrip(event)) {
scoped_ptr<views::DropTargetEvent> mapped_event(
- MapEventToTabStrip(event, event.GetData()));
+ MapEventToTabStrip(event, event.data()));
if (!forwarding_to_tab_strip_) {
tabstrip()->OnDragEntered(*mapped_event.get());
forwarding_to_tab_strip_ = true;
@@ -94,9 +94,9 @@
GURL url;
std::wstring title;
ui::OSExchangeData mapped_data;
- if (!event.GetData().GetURLAndTitle(&url, &title) || !url.is_valid()) {
+ if (!event.data().GetURLAndTitle(&url, &title) || !url.is_valid()) {
// The url isn't valid. Use the paste and go url.
- if (GetPasteAndGoURL(event.GetData(), &url))
+ if (GetPasteAndGoURL(event.data(), &url))
mapped_data.SetURL(url, std::wstring());
// else case: couldn't extract a url or 'paste and go' url. This ends up
// passing through an ui::OSExchangeData with nothing in it. We need to do
@@ -129,7 +129,7 @@
ConvertPointToView(this, tabstrip(), &tab_strip_loc);
return new views::DropTargetEvent(data, tab_strip_loc.x(),
tab_strip_loc.y(),
- event.GetSourceOperations());
+ event.source_operations());
}
BaseTabStrip* BrowserRootView::tabstrip() const {

Powered by Google App Engine
This is Rietveld 408576698