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

Side by Side Diff: chrome/browser/ui/views/content_setting_bubble_contents.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 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/content_setting_bubble_contents.h" 5 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gdk/gdk.h> 8 #include <gdk/gdk.h>
9 #endif 9 #endif
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 const views::MouseEvent& event) { 85 const views::MouseEvent& event) {
86 return event.IsLeftMouseButton() || event.IsMiddleMouseButton(); 86 return event.IsLeftMouseButton() || event.IsMiddleMouseButton();
87 } 87 }
88 88
89 void ContentSettingBubbleContents::Favicon::OnMouseReleased( 89 void ContentSettingBubbleContents::Favicon::OnMouseReleased(
90 const views::MouseEvent& event, 90 const views::MouseEvent& event,
91 bool canceled) { 91 bool canceled) {
92 if (!canceled && 92 if (!canceled &&
93 (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) && 93 (event.IsLeftMouseButton() || event.IsMiddleMouseButton()) &&
94 HitTest(event.location())) 94 HitTest(event.location()))
95 parent_->LinkActivated(link_, event.GetFlags()); 95 parent_->LinkActivated(link_, event.flags());
96 } 96 }
97 97
98 gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursorForPoint( 98 gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursorForPoint(
99 views::Event::EventType event_type, 99 views::Event::EventType event_type,
100 const gfx::Point& p) { 100 const gfx::Point& p) {
101 #if defined(OS_WIN) 101 #if defined(OS_WIN)
102 if (!g_hand_cursor) 102 if (!g_hand_cursor)
103 g_hand_cursor = LoadCursor(NULL, IDC_HAND); 103 g_hand_cursor = LoadCursor(NULL, IDC_HAND);
104 return g_hand_cursor; 104 return g_hand_cursor;
105 #elif defined(OS_LINUX) 105 #elif defined(OS_LINUX)
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 layout->StartRow(0, double_column_set_id); 333 layout->StartRow(0, double_column_set_id);
334 manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link)); 334 manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link));
335 manage_link_->SetController(this); 335 manage_link_->SetController(this);
336 layout->AddView(manage_link_); 336 layout->AddView(manage_link_);
337 337
338 close_button_ = 338 close_button_ =
339 new views::NativeButton(this, 339 new views::NativeButton(this,
340 UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE))); 340 UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE)));
341 layout->AddView(close_button_); 341 layout->AddView(close_button_);
342 } 342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698