Index: ui/views/widget/native_widget_aura.cc |
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc |
index 67254d13f2058eaecccc096dca3f1ddacadf0ea4..87cbc8570a56cb62028b64eac7b5a4289663da98 100644 |
--- a/ui/views/widget/native_widget_aura.cc |
+++ b/ui/views/widget/native_widget_aura.cc |
@@ -91,9 +91,9 @@ void AdjustScreenBounds(aura::Window* window, gfx::Rect* bounds) { |
// Used when SetInactiveRenderingDisabled() is invoked to track when active |
// status changes in such a way that we should enable inactive rendering. |
-class NativeWidgetAura::ActiveWindowObserver : |
- public aura::WindowObserver, |
- public aura::client::ActivationChangeObserver { |
+class NativeWidgetAura::ActiveWindowObserver |
+ : public aura::WindowObserver, |
+ public aura::client::ActivationChangeObserver { |
public: |
explicit ActiveWindowObserver(NativeWidgetAura* host) : host_(host) { |
host_->GetNativeView()->GetRootWindow()->AddObserver(this); |
@@ -325,7 +325,7 @@ TooltipManager* NativeWidgetAura::GetTooltipManager() const { |
bool NativeWidgetAura::IsScreenReaderActive() const { |
// http://crbug.com/102570 |
- //NOTIMPLEMENTED(); |
+ // NOTIMPLEMENTED(); |
return false; |
} |
@@ -333,7 +333,7 @@ void NativeWidgetAura::SendNativeAccessibilityEvent( |
View* view, |
ui::AccessibilityTypes::Event event_type) { |
// http://crbug.com/102570 |
- //NOTIMPLEMENTED(); |
+ // NOTIMPLEMENTED(); |
} |
void NativeWidgetAura::SetCapture() { |
@@ -410,17 +410,17 @@ void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, |
void NativeWidgetAura::SetAccessibleName(const string16& name) { |
// http://crbug.com/102570 |
- //NOTIMPLEMENTED(); |
+ // NOTIMPLEMENTED(); |
} |
void NativeWidgetAura::SetAccessibleRole(ui::AccessibilityTypes::Role role) { |
// http://crbug.com/102570 |
- //NOTIMPLEMENTED(); |
+ // NOTIMPLEMENTED(); |
} |
void NativeWidgetAura::SetAccessibleState(ui::AccessibilityTypes::State state) { |
// http://crbug.com/102570 |
- //NOTIMPLEMENTED(); |
+ // NOTIMPLEMENTED(); |
} |
void NativeWidgetAura::InitModalType(ui::ModalType modal_type) { |
@@ -617,7 +617,7 @@ void NativeWidgetAura::FlashFrame(bool flash) { |
bool NativeWidgetAura::IsAccessibleWidget() const { |
// http://crbug.com/102570 |
- //NOTIMPLEMENTED(); |
+ // NOTIMPLEMENTED(); |
return false; |
} |
@@ -816,6 +816,15 @@ void NativeWidgetAura::OnWindowVisibilityChanged(bool visible) { |
delegate_->OnNativeWidgetVisibilityChanged(visible); |
} |
+bool NativeWidgetAura::HasHitTestMask() const { |
+ return delegate_->HasHitTestMask(); |
+} |
+ |
+void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { |
+ DCHECK(mask); |
+ delegate_->GetHitTestMask(mask); |
+} |
+ |
//////////////////////////////////////////////////////////////////////////////// |
// NativeWidgetAura, aura::ActivationDelegate implementation: |