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

Side by Side Diff: ash/wm/panel_window_event_filter.cc

Issue 12212207: Support panel titles and Icons for v1 apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comment. Created 7 years, 10 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/panel_frame_view.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.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/wm/panel_window_event_filter.h" 5 #include "ash/wm/panel_window_event_filter.h"
6 6
7 #include "ash/wm/window_util.h" 7 #include "ash/wm/window_util.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "ui/aura/client/aura_constants.h" 9 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 event->StopPropagation(); 71 event->StopPropagation();
72 } 72 }
73 return; 73 return;
74 74
75 case ui::ET_MOUSE_RELEASED: 75 case ui::ET_MOUSE_RELEASED:
76 if (drag_state_ == DRAG_STARTED) { 76 if (drag_state_ == DRAG_STARTED) {
77 FinishDrag(); 77 FinishDrag();
78 event->StopPropagation(); 78 event->StopPropagation();
79 } else if (dragged_panel_ != NULL) { 79 } else if (dragged_panel_ != NULL) {
80 drag_state_ = DRAG_NONE; 80 drag_state_ = DRAG_NONE;
81 layout_manager_->ToggleMinimize(dragged_panel_);
82 dragged_panel_ = NULL; 81 dragged_panel_ = NULL;
83 event->StopPropagation(); 82 event->StopPropagation();
84 } 83 }
85 return; 84 return;
86 default: 85 default:
87 return; 86 return;
88 } 87 }
89 } 88 }
90 89
91 void PanelWindowEventFilter::OnWindowDestroying(aura::Window* window) { 90 void PanelWindowEventFilter::OnWindowDestroying(aura::Window* window) {
(...skipping 15 matching lines...) Expand all
107 } 106 }
108 107
109 void PanelWindowEventFilter::FinishDrag() { 108 void PanelWindowEventFilter::FinishDrag() {
110 layout_manager_->FinishDragging(); 109 layout_manager_->FinishDragging();
111 drag_state_ = DRAG_NONE; 110 drag_state_ = DRAG_NONE;
112 dragged_panel_ = NULL; 111 dragged_panel_ = NULL;
113 } 112 }
114 113
115 } 114 }
116 } 115 }
OLDNEW
« no previous file with comments | « ash/wm/panel_frame_view.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698