Tweaks whether Show activates the window or not. I'm pretty sure this

views/widget/native_widget_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
@@ skipping 68 matching lines @@
   window_->Init(params.create_texture_for_layer ?
                 ui::Layer::LAYER_HAS_TEXTURE : ui::Layer::LAYER_HAS_NO_TEXTURE);
   // TODO(beng): respect |params| authoritah wrt transparency.
   window_->layer()->SetFillsBoundsOpaquely(false);
   delegate_->OnNativeWidgetCreated();
   window_->set_minimum_size(delegate_->GetMinimumSize());
   window_->SetBounds(params.bounds);
   if (params.type == Widget::InitParams::TYPE_CONTROL) {
     window_->SetParent(params.GetParent());
   } else {
-    window_->SetParent(NULL);
     gfx::NativeView parent = params.GetParent();
     if (parent)
       parent->AddTransientChild(window_);
+    window_->SetParent(NULL);
   }
   // TODO(beng): do this some other way.
   delegate_->OnNativeWidgetSizeChanged(params.bounds.size());
   can_activate_ = params.can_activate;
   if (params.type != Widget::InitParams::TYPE_TOOLTIP && !params.child) {
     DCHECK(GetWidget()->GetRootView());
     views::TooltipManagerViews* manager = new views::TooltipManagerViews(
         GetWidget()->GetRootView());
     tooltip_manager_.reset(manager);
   }
@@ skipping 200 matching lines @@
 
 void NativeWidgetAura::CloseNow() {
   delete window_;
 }
 
 void NativeWidgetAura::EnableClose(bool enable) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAura::Show() {
-  window_->Show();
+  ShowWithWindowState(ui::SHOW_STATE_INACTIVE);
 }
 
 void NativeWidgetAura::Hide() {
   window_->Hide();
 }
 
 void NativeWidgetAura::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   window_->SetBounds(restored_bounds);
-  window_->Maximize();
-  window_->Show();
+  ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
 }
 
 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
-  switch(state) {
+  switch (state) {
     case ui::SHOW_STATE_MAXIMIZED:
       window_->Maximize();
       break;
     case ui::SHOW_STATE_FULLSCREEN:
       window_->Fullscreen();
       break;
     default:
       break;
   }
   window_->Show();
+  if (can_activate_ && (state != ui::SHOW_STATE_INACTIVE ||
+                        !GetWidget()->SetInitialFocus()))
+    window_->Activate();

[Ben Goodger (Google), 2011/10/31 18:31:39]

braces around this block

 }
 
 bool NativeWidgetAura::IsVisible() const {
   return window_->IsVisible();
 }
 
 void NativeWidgetAura::Activate() {
   window_->Activate();
 }
 
@@ skipping 32 matching lines @@
 void NativeWidgetAura::SetFullscreen(bool fullscreen) {
   fullscreen ? window_->Fullscreen() : window_->Restore();
 }
 
 bool NativeWidgetAura::IsFullscreen() const {
   return window_->show_state() == ui::SHOW_STATE_FULLSCREEN;
 }
 
 void NativeWidgetAura::SetOpacity(unsigned char opacity) {
   window_->layer()->SetOpacity(opacity / 255.0);
+  window_->layer()->ScheduleDraw();
 }
 
 void NativeWidgetAura::SetUseDragFrame(bool use_drag_frame) {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetAura::IsAccessibleWidget() const {
   NOTIMPLEMENTED();
   return false;
 }
@@ skipping 245 matching lines @@
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace views