Update cros network info bubble

ui/wm/core/shadow_controller.cc

 // Copyright (c) 2012 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 "ui/wm/core/shadow_controller.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
 // Returns the ShadowElevation for |window|, converting |DEFAULT| to the
 // appropriate ShadowElevation.
 ShadowElevation GetShadowElevationConvertDefault(aura::Window* window) {
   ShadowElevation elevation = window->GetProperty(kShadowElevationKey);
   return elevation == ShadowElevation::DEFAULT
              ? GetDefaultShadowElevationForWindow(window)
              : elevation;
 }
 
 ShadowElevation GetShadowElevationForActiveState(aura::Window* window) {
+  ShadowElevation elevation = window->GetProperty(kShadowElevationKey);
+  if (elevation != ShadowElevation::DEFAULT)
+    return elevation;
+
   if (IsActiveWindow(window))
     return kActiveNormalShadowElevation;
 
-  return GetShadowElevationConvertDefault(window);
+  return GetDefaultShadowElevationForWindow(window);
 }
 
 // Returns the shadow style to be applied to |losing_active| when it is losing
 // active to |gaining_active|. |gaining_active| may be of a type that hides when
 // inactive, and as such we do not want to render |losing_active| as inactive.
 ShadowElevation GetShadowElevationForWindowLosingActive(
     aura::Window* losing_active,
     aura::Window* gaining_active) {
   if (gaining_active && aura::client::GetHideOnDeactivate(gaining_active)) {
     aura::Window::Windows::const_iterator it =
@@ skipping 197 matching lines @@
   activation_client_->RemoveObserver(this);
 }
 
 void ShadowController::OnWindowActivated(ActivationReason reason,
                                          aura::Window* gained_active,
                                          aura::Window* lost_active) {
   impl_->OnWindowActivated(reason, gained_active, lost_active);
 }
 
 }  // namespace wm