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

Side by Side Diff: ash/frame/caption_buttons/frame_caption_button_container_view.cc

Issue 2223553003: Adds WmShell::RecordGestureAction() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gyp Created 4 years, 4 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/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.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/frame/caption_buttons/frame_caption_button_container_view.h" 5 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <map> 8 #include <map>
9 9
10 #include "ash/common/ash_switches.h" 10 #include "ash/common/ash_switches.h"
11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
12 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
13 #include "ash/frame/caption_buttons/frame_caption_button.h" 13 #include "ash/frame/caption_buttons/frame_caption_button.h"
14 #include "ash/frame/caption_buttons/frame_size_button.h" 14 #include "ash/frame/caption_buttons/frame_size_button.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/touch/touch_uma.h"
17 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
18 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 18 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
20 #include "ui/gfx/animation/slide_animation.h" 19 #include "ui/gfx/animation/slide_animation.h"
21 #include "ui/gfx/animation/tween.h" 20 #include "ui/gfx/animation/tween.h"
22 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
23 #include "ui/gfx/geometry/insets.h" 22 #include "ui/gfx/geometry/insets.h"
24 #include "ui/gfx/geometry/point.h" 23 #include "ui/gfx/geometry/point.h"
25 #include "ui/gfx/vector_icons_public.h" 24 #include "ui/gfx/vector_icons_public.h"
26 #include "ui/strings/grit/ui_strings.h" // Accessibility names 25 #include "ui/strings/grit/ui_strings.h" // Accessibility names
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 frame_->Restore(); 326 frame_->Restore();
328 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN; 327 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_EXIT_FULLSCREEN;
329 } else if (frame_->IsMaximized()) { 328 } else if (frame_->IsMaximized()) {
330 frame_->Restore(); 329 frame_->Restore();
331 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE; 330 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_RESTORE;
332 } else { 331 } else {
333 frame_->Maximize(); 332 frame_->Maximize();
334 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE; 333 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE;
335 } 334 }
336 335
337 if (event.IsGestureEvent()) { 336 if (event.IsGestureEvent())
338 TouchUMA::GetInstance()->RecordGestureAction( 337 WmShell::Get()->RecordGestureAction(GESTURE_FRAMEMAXIMIZE_TAP);
339 TouchUMA::GESTURE_FRAMEMAXIMIZE_TAP);
340 }
341 } else if (sender == close_button_) { 338 } else if (sender == close_button_) {
342 frame_->Close(); 339 frame_->Close();
343 action = UMA_WINDOW_CLOSE_BUTTON_CLICK; 340 action = UMA_WINDOW_CLOSE_BUTTON_CLICK;
344 } else { 341 } else {
345 return; 342 return;
346 } 343 }
347 WmShell::Get()->RecordUserMetricsAction(action); 344 WmShell::Get()->RecordUserMetricsAction(action);
348 } 345 }
349 346
350 bool FrameCaptionButtonContainerView::IsMinimizeButtonVisible() const { 347 bool FrameCaptionButtonContainerView::IsMinimizeButtonVisible() const {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 views::Button::ButtonState new_state = views::Button::STATE_NORMAL; 404 views::Button::ButtonState new_state = views::Button::STATE_NORMAL;
408 if (button == to_hover) 405 if (button == to_hover)
409 new_state = views::Button::STATE_HOVERED; 406 new_state = views::Button::STATE_HOVERED;
410 else if (button == to_press) 407 else if (button == to_press)
411 new_state = views::Button::STATE_PRESSED; 408 new_state = views::Button::STATE_PRESSED;
412 button->SetState(new_state); 409 button->SetState(new_state);
413 } 410 }
414 } 411 }
415 412
416 } // namespace ash 413 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698