| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/wm/overview/window_selector.h" | 5 #include "ash/common/wm/overview/window_selector.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <functional> | 8 #include <functional> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 WmWindow* root_window, | 199 WmWindow* root_window, |
| 200 const gfx::ImageSkia& image, | 200 const gfx::ImageSkia& image, |
| 201 int* text_filter_bottom) { | 201 int* text_filter_bottom) { |
| 202 views::Widget* widget = new views::Widget; | 202 views::Widget* widget = new views::Widget; |
| 203 views::Widget::InitParams params; | 203 views::Widget::InitParams params; |
| 204 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; | 204 params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; |
| 205 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 205 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 206 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 206 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
| 207 params.accept_events = true; | 207 params.accept_events = true; |
| 208 params.bounds = GetTextFilterPosition(root_window); | 208 params.bounds = GetTextFilterPosition(root_window); |
| 209 params.name = "OverviewModeTextFilter"; |
| 209 *text_filter_bottom = params.bounds.bottom(); | 210 *text_filter_bottom = params.bounds.bottom(); |
| 210 root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer( | 211 root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer( |
| 211 widget, kShellWindowId_StatusContainer, ¶ms); | 212 widget, kShellWindowId_StatusContainer, ¶ms); |
| 212 widget->Init(params); | 213 widget->Init(params); |
| 213 | 214 |
| 214 // Use |container| to specify the padding surrounding the text and to give | 215 // Use |container| to specify the padding surrounding the text and to give |
| 215 // the textfield rounded corners. | 216 // the textfield rounded corners. |
| 216 const bool material = ash::MaterialDesignController::IsOverviewMaterial(); | 217 const bool material = ash::MaterialDesignController::IsOverviewMaterial(); |
| 217 views::View* container = new RoundedContainerView( | 218 views::View* container = new RoundedContainerView( |
| 218 material ? kTextFilterCornerRadiusMD : kTextFilterCornerRadius, | 219 material ? kTextFilterCornerRadiusMD : kTextFilterCornerRadius, |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 for (size_t i = 0; i <= grid_list_.size() && | 719 for (size_t i = 0; i <= grid_list_.size() && |
| 719 grid_list_[selected_grid_index_]->Move(direction, animate); | 720 grid_list_[selected_grid_index_]->Move(direction, animate); |
| 720 i++) { | 721 i++) { |
| 721 selected_grid_index_ = | 722 selected_grid_index_ = |
| 722 (selected_grid_index_ + display_direction + grid_list_.size()) % | 723 (selected_grid_index_ + display_direction + grid_list_.size()) % |
| 723 grid_list_.size(); | 724 grid_list_.size(); |
| 724 } | 725 } |
| 725 } | 726 } |
| 726 | 727 |
| 727 } // namespace ash | 728 } // namespace ash |
| OLD | NEW |