summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 19:44:08 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 19:44:08 +0000
commitea567c840775f14b1fb339dc8690179bbf53b2c3 (patch)
treeda14d7f561f8f7919e8bb2fd0fd1158b33d4b9c0 /views
parent86a901183e61eed53030363edff1cbc333ce9da9 (diff)
downloadchromium_src-ea567c840775f14b1fb339dc8690179bbf53b2c3.zip
chromium_src-ea567c840775f14b1fb339dc8690179bbf53b2c3.tar.gz
chromium_src-ea567c840775f14b1fb339dc8690179bbf53b2c3.tar.bz2
Wires up the active methods in NativeWidgetAura.
BUG=none TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8196007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/widget/native_widget_aura.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc
index b71992f..d5c1190 100644
--- a/views/widget/native_widget_aura.cc
+++ b/views/widget/native_widget_aura.cc
@@ -84,7 +84,8 @@ NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() {
}
void NativeWidgetAura::UpdateFrameAfterFrameChange() {
- NOTIMPLEMENTED();
+ // We don't support changing the frame type.
+ NOTREACHED();
}
bool NativeWidgetAura::ShouldUseNativeFrame() const {
@@ -93,7 +94,10 @@ bool NativeWidgetAura::ShouldUseNativeFrame() const {
}
void NativeWidgetAura::FrameTypeChanged() {
- NOTIMPLEMENTED();
+ // This is called when the Theme has changed; forward the event to the root
+ // widget.
+ GetWidget()->ThemeChanged();
+ GetWidget()->GetRootView()->SchedulePaint();
}
Widget* NativeWidgetAura::GetWidget() {
@@ -314,16 +318,15 @@ bool NativeWidgetAura::IsVisible() const {
}
void NativeWidgetAura::Activate() {
- NOTIMPLEMENTED();
+ window_->Activate();
}
void NativeWidgetAura::Deactivate() {
- NOTIMPLEMENTED();
+ window_->Deactivate();
}
bool NativeWidgetAura::IsActive() const {
- //NOTIMPLEMENTED();
- return false;
+ return aura::Desktop::GetInstance()->active_window() == window_;
}
void NativeWidgetAura::SetAlwaysOnTop(bool on_top) {