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

Side by Side Diff: ash/touch/touch_observer_hud.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/touch/touch_hud_projection.cc ('k') | ash/touch/touch_observer_hud_unittest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/touch/touch_observer_hud.h" 5 #include "ash/touch/touch_observer_hud.h"
6 6
7 #include "ash/common/shell_window_ids.h" 7 #include "ash/common/shell_window_ids.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/root_window_settings.h" 9 #include "ash/root_window_settings.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 12 matching lines...) Expand all
23 widget_(NULL) { 23 widget_(NULL) {
24 const display::Display& display = 24 const display::Display& display =
25 Shell::GetInstance()->display_manager()->GetDisplayForId(display_id_); 25 Shell::GetInstance()->display_manager()->GetDisplayForId(display_id_);
26 26
27 views::View* content = new views::View; 27 views::View* content = new views::View;
28 28
29 const gfx::Size& display_size = display.size(); 29 const gfx::Size& display_size = display.size();
30 content->SetSize(display_size); 30 content->SetSize(display_size);
31 31
32 widget_ = new views::Widget(); 32 widget_ = new views::Widget();
33 views::Widget::InitParams 33 views::Widget::InitParams params(
34 params(views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 34 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
35 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 35 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
36 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; 36 params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
37 params.accept_events = false; 37 params.accept_events = false;
38 params.bounds = display.bounds(); 38 params.bounds = display.bounds();
39 params.parent = 39 params.parent =
40 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer); 40 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer);
41 widget_->Init(params); 41 widget_->Init(params);
42 widget_->SetContentsView(content); 42 widget_->SetContentsView(content);
43 widget_->StackAtTop(); 43 widget_->StackAtTop();
44 widget_->Show(); 44 widget_->Show();
(...skipping 14 matching lines...) Expand all
59 Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this); 59 Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
60 60
61 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
62 Shell::GetInstance()->display_configurator()->RemoveObserver(this); 62 Shell::GetInstance()->display_configurator()->RemoveObserver(this);
63 #endif // defined(OS_CHROMEOS) 63 #endif // defined(OS_CHROMEOS)
64 display::Screen::GetScreen()->RemoveObserver(this); 64 display::Screen::GetScreen()->RemoveObserver(this);
65 65
66 widget_->RemoveObserver(this); 66 widget_->RemoveObserver(this);
67 } 67 }
68 68
69 void TouchObserverHUD::Clear() { 69 void TouchObserverHUD::Clear() {}
70 }
71 70
72 void TouchObserverHUD::Remove() { 71 void TouchObserverHUD::Remove() {
73 root_window_->RemovePreTargetHandler(this); 72 root_window_->RemovePreTargetHandler(this);
74 73
75 RootWindowController* controller = GetRootWindowController(root_window_); 74 RootWindowController* controller = GetRootWindowController(root_window_);
76 UnsetHudForRootWindowController(controller); 75 UnsetHudForRootWindowController(controller);
77 76
78 widget_->CloseNow(); 77 widget_->CloseNow();
79 } 78 }
80 79
81 void TouchObserverHUD::OnTouchEvent(ui::TouchEvent* /*event*/) { 80 void TouchObserverHUD::OnTouchEvent(ui::TouchEvent* /*event*/) {}
82 }
83 81
84 void TouchObserverHUD::OnWidgetDestroying(views::Widget* widget) { 82 void TouchObserverHUD::OnWidgetDestroying(views::Widget* widget) {
85 DCHECK_EQ(widget, widget_); 83 DCHECK_EQ(widget, widget_);
86 delete this; 84 delete this;
87 } 85 }
88 86
89 void TouchObserverHUD::OnDisplayAdded(const display::Display& new_display) {} 87 void TouchObserverHUD::OnDisplayAdded(const display::Display& new_display) {}
90 88
91 void TouchObserverHUD::OnDisplayRemoved(const display::Display& old_display) { 89 void TouchObserverHUD::OnDisplayRemoved(const display::Display& old_display) {
92 if (old_display.id() != display_id_) 90 if (old_display.id() != display_id_)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 widget_->GetNativeView(), 142 widget_->GetNativeView(),
145 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer)); 143 Shell::GetContainer(root_window_, kShellWindowId_OverlayContainer));
146 144
147 RootWindowController* controller = GetRootWindowController(root_window_); 145 RootWindowController* controller = GetRootWindowController(root_window_);
148 SetHudForRootWindowController(controller); 146 SetHudForRootWindowController(controller);
149 147
150 root_window_->AddPreTargetHandler(this); 148 root_window_->AddPreTargetHandler(this);
151 } 149 }
152 150
153 } // namespace ash 151 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touch_hud_projection.cc ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698