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

Side by Side Diff: chrome/browser/ui/panels/panel_view.h

Issue 10827206: Revert 150420 - Accelerator support for browserless panels on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/panels/panel_view.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 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_VIEW_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_VIEW_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_VIEW_H_
7 7
8 #include <map>
9 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/panels/native_panel.h" 9 #include "chrome/browser/ui/panels/native_panel.h"
11 #include "ui/base/animation/animation_delegate.h" 10 #include "ui/base/animation/animation_delegate.h"
12 #include "ui/views/widget/widget_delegate.h" 11 #include "ui/views/widget/widget_delegate.h"
13 #include "ui/views/widget/widget_observer.h" 12 #include "ui/views/widget/widget_observer.h"
14 13
15 class Panel; 14 class Panel;
16 class PanelBoundsAnimation; 15 class PanelBoundsAnimation;
17 class PanelFrameView; 16 class PanelFrameView;
18 class TaskbarWindowThumbnailerWin; 17 class TaskbarWindowThumbnailerWin;
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 bool is_drawing_attention_; 184 bool is_drawing_attention_;
186 185
187 // Should we force to paint the panel as inactive? This is needed when we need 186 // Should we force to paint the panel as inactive? This is needed when we need
188 // to capture the screenshot before an active panel goes minimized. 187 // to capture the screenshot before an active panel goes minimized.
189 bool force_to_paint_as_inactive_; 188 bool force_to_paint_as_inactive_;
190 189
191 // The last view that had focus in the panel. This is saved so that focus can 190 // The last view that had focus in the panel. This is saved so that focus can
192 // be restored properly when a drag ends. 191 // be restored properly when a drag ends.
193 views::View* old_focused_view_; 192 views::View* old_focused_view_;
194 193
195 // A mapping between accelerators and commands.
196 static std::map<ui::Accelerator, int> accelerator_table_;
197
198 #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA) 194 #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA)
199 // Used to provide custom taskbar thumbnail for Windows 7 and later. 195 // Used to provide custom taskbar thumbnail for Windows 7 and later.
200 scoped_ptr<TaskbarWindowThumbnailerWin> thumbnailer_; 196 scoped_ptr<TaskbarWindowThumbnailerWin> thumbnailer_;
201 #endif 197 #endif
202 198
203 DISALLOW_COPY_AND_ASSIGN(PanelView); 199 DISALLOW_COPY_AND_ASSIGN(PanelView);
204 }; 200 };
205 201
206 #endif // CHROME_BROWSER_UI_PANELS_PANEL_VIEW_H_ 202 #endif // CHROME_BROWSER_UI_PANELS_PANEL_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/panels/panel_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698