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

Side by Side Diff: ui/aura_shell/launcher/launcher_view.h

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « ui/aura_shell/launcher/launcher.cc ('k') | ui/aura_shell/launcher/launcher_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_AURA_SHELL_LAUNCHER_VIEW_H_ 5 #ifndef UI_AURA_SHELL_LAUNCHER_VIEW_H_
6 #define UI_AURA_SHELL_LAUNCHER_VIEW_H_ 6 #define UI_AURA_SHELL_LAUNCHER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "ui/aura_shell/launcher/launcher_button_host.h" 11 #include "ui/aura_shell/launcher/launcher_button_host.h"
12 #include "ui/aura_shell/launcher/launcher_model_observer.h" 12 #include "ui/aura_shell/launcher/launcher_model_observer.h"
13 #include "ui/views/widget/widget_delegate.h"
14 #include "views/controls/button/button.h" 13 #include "views/controls/button/button.h"
14 #include "views/widget/widget_delegate.h"
15 15
16 namespace views { 16 namespace views {
17 class BoundsAnimator; 17 class BoundsAnimator;
18 class ImageButton; 18 class ImageButton;
19 class MenuRunner; 19 class MenuRunner;
20 } 20 }
21 21
22 namespace aura_shell { 22 namespace aura_shell {
23 23
24 struct LauncherItem; 24 struct LauncherItem;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 scoped_ptr<views::MenuRunner> overflow_menu_runner_; 141 scoped_ptr<views::MenuRunner> overflow_menu_runner_;
142 142
143 DISALLOW_COPY_AND_ASSIGN(LauncherView); 143 DISALLOW_COPY_AND_ASSIGN(LauncherView);
144 }; 144 };
145 145
146 } // namespace internal 146 } // namespace internal
147 } // namespace aura_shell 147 } // namespace aura_shell
148 148
149 #endif // UI_AURA_SHELL_LAUNCHER_VIEW_H_ 149 #endif // UI_AURA_SHELL_LAUNCHER_VIEW_H_
OLDNEW
« no previous file with comments | « ui/aura_shell/launcher/launcher.cc ('k') | ui/aura_shell/launcher/launcher_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698