Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Side by Side Diff: ash/wm/overview/window_selector_window.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/wm/overview/window_selector_window.h" 5 #include "ash/wm/overview/window_selector_window.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/overview/scoped_transform_overview_window.h" 9 #include "ash/wm/overview/scoped_transform_overview_window.h"
10 #include "grit/ash_resources.h" 10 #include "grit/ash_resources.h"
(...skipping 10 matching lines...) Expand all
21 namespace { 21 namespace {
22 22
23 views::Widget* CreateCloseWindowButton(aura::Window* root_window, 23 views::Widget* CreateCloseWindowButton(aura::Window* root_window,
24 views::ButtonListener* listener) { 24 views::ButtonListener* listener) {
25 views::Widget* widget = new views::Widget; 25 views::Widget* widget = new views::Widget;
26 views::Widget::InitParams params; 26 views::Widget::InitParams params;
27 params.type = views::Widget::InitParams::TYPE_POPUP; 27 params.type = views::Widget::InitParams::TYPE_POPUP;
28 params.can_activate = false; 28 params.can_activate = false;
29 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 29 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
30 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 30 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
31 params.parent = Shell::GetContainer(root_window, 31 params.parent =
32 ash::internal::kShellWindowId_OverlayContainer); 32 Shell::GetContainer(root_window, ash::kShellWindowId_OverlayContainer);
33 widget->set_focus_on_creation(false); 33 widget->set_focus_on_creation(false);
34 widget->Init(params); 34 widget->Init(params);
35 views::ImageButton* button = new views::ImageButton(listener); 35 views::ImageButton* button = new views::ImageButton(listener);
36 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 36 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
37 button->SetImage(views::CustomButton::STATE_NORMAL, 37 button->SetImage(views::CustomButton::STATE_NORMAL,
38 rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE)); 38 rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE));
39 button->SetImage(views::CustomButton::STATE_HOVERED, 39 button->SetImage(views::CustomButton::STATE_HOVERED,
40 rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE_H)); 40 rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE_H));
41 button->SetImage(views::CustomButton::STATE_PRESSED, 41 button->SetImage(views::CustomButton::STATE_PRESSED,
42 rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE_P)); 42 rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE_P));
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 close_button_->GetNativeWindow()->layer()->GetAnimator()); 161 close_button_->GetNativeWindow()->layer()->GetAnimator());
162 settings.SetPreemptionStrategy( 162 settings.SetPreemptionStrategy(
163 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); 163 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
164 settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds( 164 settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
165 ScopedTransformOverviewWindow::kTransitionMilliseconds)); 165 ScopedTransformOverviewWindow::kTransitionMilliseconds));
166 close_button_->GetNativeWindow()->SetTransform(close_button_transform); 166 close_button_->GetNativeWindow()->SetTransform(close_button_transform);
167 } 167 }
168 } 168 }
169 169
170 } // namespace ash 170 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698