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

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

Issue 441803004: Introduce new WebApp header style for hosted apps and fizzy apps on ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/frame/caption_buttons/caption_button_types.h ('k') | ash/frame/custom_frame_view_ash.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_size_button.h" 5 #include "ash/frame/caption_buttons/frame_size_button.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/screen_util.h" 8 #include "ash/screen_util.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/touch/touch_uma.h" 10 #include "ash/touch/touch_uma.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 switch (to_hover->icon()) { 207 switch (to_hover->icon()) {
208 case CAPTION_BUTTON_ICON_LEFT_SNAPPED: 208 case CAPTION_BUTTON_ICON_LEFT_SNAPPED:
209 snap_type_ = SNAP_LEFT; 209 snap_type_ = SNAP_LEFT;
210 break; 210 break;
211 case CAPTION_BUTTON_ICON_RIGHT_SNAPPED: 211 case CAPTION_BUTTON_ICON_RIGHT_SNAPPED:
212 snap_type_ = SNAP_RIGHT; 212 snap_type_ = SNAP_RIGHT;
213 break; 213 break;
214 case CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE: 214 case CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE:
215 case CAPTION_BUTTON_ICON_MINIMIZE: 215 case CAPTION_BUTTON_ICON_MINIMIZE:
216 case CAPTION_BUTTON_ICON_CLOSE: 216 case CAPTION_BUTTON_ICON_CLOSE:
217 case CAPTION_BUTTON_ICON_BACK:
217 case CAPTION_BUTTON_ICON_COUNT: 218 case CAPTION_BUTTON_ICON_COUNT:
218 NOTREACHED(); 219 NOTREACHED();
219 break; 220 break;
220 } 221 }
221 } 222 }
222 223
223 if (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT) { 224 if (snap_type_ == SNAP_LEFT || snap_type_ == SNAP_RIGHT) {
224 aura::Window* window = frame_->GetNativeWindow(); 225 aura::Window* window = frame_->GetNativeWindow();
225 if (!phantom_window_controller_.get()) { 226 if (!phantom_window_controller_.get()) {
226 phantom_window_controller_.reset(new PhantomWindowController(window)); 227 phantom_window_controller_.reset(new PhantomWindowController(window));
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 void FrameSizeButton::SetButtonsToNormalMode( 276 void FrameSizeButton::SetButtonsToNormalMode(
276 FrameSizeButtonDelegate::Animate animate) { 277 FrameSizeButtonDelegate::Animate animate) {
277 in_snap_mode_ = false; 278 in_snap_mode_ = false;
278 snap_type_ = SNAP_NONE; 279 snap_type_ = SNAP_NONE;
279 set_buttons_to_snap_mode_timer_.Stop(); 280 set_buttons_to_snap_mode_timer_.Stop();
280 delegate_->SetButtonsToNormal(animate); 281 delegate_->SetButtonsToNormal(animate);
281 phantom_window_controller_.reset(); 282 phantom_window_controller_.reset();
282 } 283 }
283 284
284 } // namespace ash 285 } // namespace ash
OLDNEW
« no previous file with comments | « ash/frame/caption_buttons/caption_button_types.h ('k') | ash/frame/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698