diff options
author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 12:15:09 +0000 |
---|---|---|
committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 12:15:09 +0000 |
commit | 28fc47341b0eb52d82dc0105c2c426661127b057 (patch) | |
tree | fa7938dbb29f6aebb6fbd3e2d2aa26bcadc90114 /ash | |
parent | f67cd911521b98ca375986740cd58e7b0e4356ae (diff) | |
download | chromium_src-28fc47341b0eb52d82dc0105c2c426661127b057.zip chromium_src-28fc47341b0eb52d82dc0105c2c426661127b057.tar.gz chromium_src-28fc47341b0eb52d82dc0105c2c426661127b057.tar.bz2 |
ExternalTabContainerWin's widgets should be opaque and not fade-in.
r190446 accidentally made Chrome Frame windows transparent and invisible (except when viewed via RDP). This change brings them back.
BUG=223560,237579
Review URL: https://chromiumcodereview.appspot.com/14263020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r-- | ash/accelerators/exit_warning_handler.cc | 2 | ||||
-rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 2 | ||||
-rw-r--r-- | ash/display/shared_display_edge_indicator.cc | 2 | ||||
-rw-r--r-- | ash/drag_drop/drag_image_view.cc | 2 | ||||
-rw-r--r-- | ash/launcher/launcher_tooltip_manager_unittest.cc | 2 | ||||
-rw-r--r-- | ash/magnifier/partial_magnification_controller.cc | 2 | ||||
-rw-r--r-- | ash/shelf/shelf_widget.cc | 4 | ||||
-rw-r--r-- | ash/system/status_area_widget.cc | 2 | ||||
-rw-r--r-- | ash/system/user/tray_user.cc | 2 | ||||
-rw-r--r-- | ash/touch/touch_observer_hud.cc | 2 | ||||
-rw-r--r-- | ash/wm/drag_window_controller.cc | 2 | ||||
-rw-r--r-- | ash/wm/gestures/long_press_affordance_handler.cc | 2 | ||||
-rw-r--r-- | ash/wm/panels/panel_layout_manager.cc | 2 | ||||
-rw-r--r-- | ash/wm/partial_screenshot_view.cc | 2 | ||||
-rw-r--r-- | ash/wm/workspace/multi_window_resize_controller.cc | 2 | ||||
-rw-r--r-- | ash/wm/workspace/phantom_window_controller.cc | 2 |
16 files changed, 17 insertions, 17 deletions
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc index 36b5b21..6de4ce6 100644 --- a/ash/accelerators/exit_warning_handler.cc +++ b/ash/accelerators/exit_warning_handler.cc @@ -169,7 +169,7 @@ void ExitWarningHandler::Show() { views::Widget::InitParams params; params.type = views::Widget::InitParams::TYPE_POPUP; params.transient = true; - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.accept_events = false; params.can_activate = false; params.keep_on_top = true; diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index e27a183..bb020ad 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -188,7 +188,7 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window, views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); if (controller->GetWallpaper().isNull()) - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.parent = root_window->GetChildById(container_id); desktop_widget->Init(params); desktop_widget->SetContentsView(new DesktopBackgroundView()); diff --git a/ash/display/shared_display_edge_indicator.cc b/ash/display/shared_display_edge_indicator.cc index 5370c3b..cfcf4ba 100644 --- a/ash/display/shared_display_edge_indicator.cc +++ b/ash/display/shared_display_edge_indicator.cc @@ -49,7 +49,7 @@ views::Widget* CreateWidget(const gfx::Rect& bounds, views::View* contents_view) { views::Widget* widget = new views::Widget; views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.can_activate = false; params.keep_on_top = true; // We set the context to the primary root window; this is OK because the ash diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc index 066b99c..242488b 100644 --- a/ash/drag_drop/drag_image_view.cc +++ b/ash/drag_drop/drag_image_view.cc @@ -26,7 +26,7 @@ Widget* CreateDragWidget(gfx::NativeView context) { params.context = context; params.accept_events = false; params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; - params.transparent = true; + params.opacity = Widget::InitParams::TRANSLUCENT_WINDOW; drag_widget->Init(params); drag_widget->SetOpacity(0xFF); drag_widget->GetNativeWindow()->set_owned_by_parent(false); diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index 6a38d09..206fc0f 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -90,7 +90,7 @@ class LauncherTooltipManagerTest : public AshTestBase { widget_.reset(new views::Widget); views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.parent = Shell::GetContainer( Shell::GetPrimaryRootWindow(), diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc index 1f46d51..d913856 100644 --- a/ash/magnifier/partial_magnification_controller.cc +++ b/ash/magnifier/partial_magnification_controller.cc @@ -144,7 +144,7 @@ void PartialMagnificationController::CreateMagnifierWindow() { views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); params.can_activate = false; params.accept_events = false; - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.parent = root_window; zoom_widget_->Init(params); zoom_widget_->SetBounds(gfx::Rect(mouse.x() - kMagnifierWidth / 2, diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index 9f95946..8774f89 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -322,7 +322,7 @@ void ShelfWidget::DelegateView::SetDimmed(bool value) { dimmer_.reset(new views::Widget); views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.can_activate = false; params.accept_events = false; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; @@ -436,7 +436,7 @@ ShelfWidget::ShelfWidget(aura::Window* shelf_container, window_container_(shelf_container) { views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.parent = shelf_container; params.delegate = delegate_view_; diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index 1430bd1..471e885 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc @@ -35,7 +35,7 @@ StatusAreaWidget::StatusAreaWidget(aura::Window* status_container) views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); params.delegate = status_area_widget_delegate_; params.parent = status_container; - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; Init(params); set_focus_on_creation(false); SetContentsView(status_area_widget_delegate_); diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index e3c47e8..10c07bd 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -917,7 +917,7 @@ void UserView::ToggleAddUserMenuOption() { params.context = this->GetWidget()->GetNativeWindow(); params.accept_events = true; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; add_menu_option_->Init(params); add_menu_option_->SetOpacity(0xFF); add_menu_option_->GetNativeWindow()->set_owned_by_parent(false); diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index a9ac307..135da1a 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -490,7 +490,7 @@ TouchObserverHUD::TouchObserverHUD(aura::RootWindow* initial_root) widget_ = new views::Widget(); views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.can_activate = false; params.accept_events = false; params.bounds = gfx::Rect(display_size); diff --git a/ash/wm/drag_window_controller.cc b/ash/wm/drag_window_controller.cc index 85e2cb4..01ae80f 100644 --- a/ash/wm/drag_window_controller.cc +++ b/ash/wm/drag_window_controller.cc @@ -67,7 +67,7 @@ void DragWindowController::CreateDragWidget(const gfx::Rect& bounds) { DCHECK(!drag_widget_); drag_widget_ = new views::Widget; views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.parent = window_->parent(); params.can_activate = false; params.keep_on_top = true; diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc index d35c3f0..5450e97 100644 --- a/ash/wm/gestures/long_press_affordance_handler.cc +++ b/ash/wm/gestures/long_press_affordance_handler.cc @@ -66,7 +66,7 @@ views::Widget* CreateAffordanceWidget(aura::RootWindow* root_window) { params.accept_events = false; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.context = root_window; - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; widget->Init(params); widget->SetOpacity(0xFF); ash::GetRootWindowController(root_window)->GetContainer( diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index b8d6077..efb1826 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -223,7 +223,7 @@ class PanelCalloutWidget : public views::Widget { void InitWidget(aura::Window* parent) { views::Widget::InitParams params; params.type = views::Widget::InitParams::TYPE_POPUP; - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.can_activate = false; params.keep_on_top = true; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index 032c91b..1b2fa66 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -112,7 +112,7 @@ void PartialScreenshotView::Init(aura::RootWindow* root_window) { views::Widget* widget = new views::Widget; views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.delegate = this; // The partial screenshot rectangle has to be at the real top of // the screen. diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc index 8880e33..c447b9c 100644 --- a/ash/wm/workspace/multi_window_resize_controller.cc +++ b/ash/wm/workspace/multi_window_resize_controller.cc @@ -384,7 +384,7 @@ void MultiWindowResizeController::ShowNow() { show_timer_.Stop(); resize_widget_.reset(new views::Widget); views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.parent = Shell::GetContainer( Shell::GetActiveRootWindow(), diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc index 8cdbd0c..4287d5b 100644 --- a/ash/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc @@ -137,7 +137,7 @@ void PhantomWindowController::CreatePhantomWidget(const gfx::Rect& bounds) { DCHECK(!phantom_widget_); phantom_widget_ = new views::Widget; views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - params.transparent = true; + params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; // PhantomWindowController is used by FrameMaximizeButton to highlight the // launcher button. Put the phantom in the same window as the launcher so that // the phantom is visible. |