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

Side by Side Diff: ash/shell/window_type_launcher.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 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/shell/content_client/shell_browser_main_parts.cc ('k') | ash/system/tray/system_tray.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/shell/window_type_launcher.h" 5 #include "ash/shell/window_type_launcher.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h"
9 #include "ash/shell_window_ids.h"
10 #include "ash/shell/example_factory.h" 8 #include "ash/shell/example_factory.h"
11 #include "ash/shell/panel_window.h" 9 #include "ash/shell/panel_window.h"
12 #include "ash/shell/toplevel_window.h" 10 #include "ash/shell/toplevel_window.h"
11 #include "ash/shell_delegate.h"
12 #include "ash/shell_window_ids.h"
13 #include "ash/wm/shadow_types.h" 13 #include "ash/wm/shadow_types.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "ui/aura/root_window.h" 15 #include "ui/aura/root_window.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/compositor/layer.h"
17 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/compositor/layer.h"
19 #include "ui/views/controls/button/text_button.h" 19 #include "ui/views/controls/button/text_button.h"
20 #include "ui/views/controls/menu/menu_item_view.h" 20 #include "ui/views/controls/menu/menu_item_view.h"
21 #include "ui/views/controls/menu/menu_runner.h" 21 #include "ui/views/controls/menu/menu_runner.h"
22 #include "ui/views/examples/examples_window.h" 22 #include "ui/views/examples/examples_window.h"
23 #include "ui/views/layout/grid_layout.h" 23 #include "ui/views/layout/grid_layout.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
25 25
26 using views::MenuItemView; 26 using views::MenuItemView;
27 using views::MenuRunner; 27 using views::MenuRunner;
28 28
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 menu_runner_.reset(new MenuRunner(root)); 344 menu_runner_.reset(new MenuRunner(root));
345 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()), 345 if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
346 MenuItemView::TOPLEFT, 346 MenuItemView::TOPLEFT,
347 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED) 347 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
348 return; 348 return;
349 } 349 }
350 #endif // !defined(OS_MACOSX) 350 #endif // !defined(OS_MACOSX)
351 351
352 } // namespace shell 352 } // namespace shell
353 } // namespace ash 353 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698