diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 05:13:59 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 05:13:59 +0000 |
| commit | 3f13cf1bb818c511a30b01730b27064b6908d40a (patch) | |
| tree | 4dcba0d4be32cc2ab132f2189a2c85a876d8f484 /ash | |
| parent | 5ebaa97366a34d6ac85685ee62c9cddf1df4b860 (diff) | |
| download | chromium_src-3f13cf1bb818c511a30b01730b27064b6908d40a.zip chromium_src-3f13cf1bb818c511a30b01730b27064b6908d40a.tar.gz chromium_src-3f13cf1bb818c511a30b01730b27064b6908d40a.tar.bz2 | |
* Remove unnecessary SetProperty(kStayInSameRootWindowKey)
This is set in container now, so no need to set individual window underneath.
* Set kStayInSameRootWindowKey to ShelfContainer, to be consistent with other containers.
* Rename launcher_container to shelf_container in RWC.cc.
BUG=256747
Review URL: https://chromiumcodereview.appspot.com/18688003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/root_window_controller.cc | 7 | ||||
| -rw-r--r-- | ash/shelf/shelf_widget.cc | 1 | ||||
| -rw-r--r-- | ash/system/status_area_widget.cc | 1 | ||||
| -rw-r--r-- | ash/system/tray/tray_bubble_wrapper.cc | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 06e35fc..3e46f50 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -605,11 +605,12 @@ void RootWindowController::CreateContainersInRootWindow( non_lock_screen_containers); SetUsesScreenCoordinates(panel_container); - aura::Window* launcher_container = + aura::Window* shelf_container = CreateContainer(kShellWindowId_ShelfContainer, - "LauncherContainer", + "ShelfContainer", non_lock_screen_containers); - SetUsesScreenCoordinates(launcher_container); + SetUsesScreenCoordinates(shelf_container); + DescendantShouldStayInSameRootWindow(shelf_container); aura::Window* app_list_container = CreateContainer(kShellWindowId_AppListContainer, diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index 1f83de4..7c478c7 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -491,7 +491,6 @@ ShelfWidget::ShelfWidget(aura::Window* shelf_container, new internal::StatusAreaLayoutManager(this)); views::Widget::AddObserver(this); - GetNativeView()->SetProperty(internal::kStayInSameRootWindowKey, true); } ShelfWidget::~ShelfWidget() { diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index 471e885..d6ba128 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc @@ -40,7 +40,6 @@ StatusAreaWidget::StatusAreaWidget(aura::Window* status_container) set_focus_on_creation(false); SetContentsView(status_area_widget_delegate_); GetNativeView()->SetName(kNativeViewName); - GetNativeView()->SetProperty(internal::kStayInSameRootWindowKey, true); } StatusAreaWidget::~StatusAreaWidget() { diff --git a/ash/system/tray/tray_bubble_wrapper.cc b/ash/system/tray/tray_bubble_wrapper.cc index 17fdcbc..5d641ee 100644 --- a/ash/system/tray/tray_bubble_wrapper.cc +++ b/ash/system/tray/tray_bubble_wrapper.cc @@ -21,8 +21,6 @@ TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray, bubble_view_(bubble_view) { bubble_widget_ = views::BubbleDelegateView::CreateBubble(bubble_view_); bubble_widget_->AddObserver(this); - bubble_widget_->GetNativeView()-> - SetProperty(internal::kStayInSameRootWindowKey, true); tray_->InitializeBubbleAnimations(bubble_widget_); tray_->UpdateBubbleViewArrow(bubble_view_); |