| 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/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/frame/caption_buttons/frame_caption_button.h" | 10 #include "ash/frame/caption_buttons/frame_caption_button.h" |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 } else { | 331 } else { |
| 332 frame_->Maximize(); | 332 frame_->Maximize(); |
| 333 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE; | 333 action = UMA_WINDOW_MAXIMIZE_BUTTON_CLICK_MAXIMIZE; |
| 334 } | 334 } |
| 335 | 335 |
| 336 if (event.IsGestureEvent()) | 336 if (event.IsGestureEvent()) |
| 337 ShellPort::Get()->RecordGestureAction(GESTURE_FRAMEMAXIMIZE_TAP); | 337 ShellPort::Get()->RecordGestureAction(GESTURE_FRAMEMAXIMIZE_TAP); |
| 338 } else if (sender == close_button_) { | 338 } else if (sender == close_button_) { |
| 339 frame_->Close(); | 339 frame_->Close(); |
| 340 action = UMA_WINDOW_CLOSE_BUTTON_CLICK; | 340 action = UMA_WINDOW_CLOSE_BUTTON_CLICK; |
| 341 if (ash::Shell::Get() |
| 342 ->maximize_mode_controller() |
| 343 ->IsMaximizeModeWindowManagerEnabled()) { |
| 344 action = UMA_TABLET_WINDOW_CLOSE_THROUGH_CAPTION_BUTTON; |
| 345 } |
| 341 } else { | 346 } else { |
| 342 return; | 347 return; |
| 343 } | 348 } |
| 344 ShellPort::Get()->RecordUserMetricsAction(action); | 349 ShellPort::Get()->RecordUserMetricsAction(action); |
| 345 } | 350 } |
| 346 | 351 |
| 347 bool FrameCaptionButtonContainerView::IsMinimizeButtonVisible() const { | 352 bool FrameCaptionButtonContainerView::IsMinimizeButtonVisible() const { |
| 348 return minimize_button_->visible(); | 353 return minimize_button_->visible(); |
| 349 } | 354 } |
| 350 | 355 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 views::Button::ButtonState new_state = views::Button::STATE_NORMAL; | 409 views::Button::ButtonState new_state = views::Button::STATE_NORMAL; |
| 405 if (button == to_hover) | 410 if (button == to_hover) |
| 406 new_state = views::Button::STATE_HOVERED; | 411 new_state = views::Button::STATE_HOVERED; |
| 407 else if (button == to_press) | 412 else if (button == to_press) |
| 408 new_state = views::Button::STATE_PRESSED; | 413 new_state = views::Button::STATE_PRESSED; |
| 409 button->SetState(new_state); | 414 button->SetState(new_state); |
| 410 } | 415 } |
| 411 } | 416 } |
| 412 | 417 |
| 413 } // namespace ash | 418 } // namespace ash |
| OLD | NEW |