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

Side by Side Diff: ash/wm/workspace/frame_maximize_button.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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/shadow.cc ('k') | ash/wm/workspace/multi_window_resize_controller.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/workspace/frame_maximize_button.h" 5 #include "ash/wm/workspace/frame_maximize_button.h"
6 6
7 #include "ash/launcher/launcher.h" 7 #include "ash/launcher/launcher.h"
8 #include "ash/screen_ash.h" 8 #include "ash/screen_ash.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/maximize_bubble_controller.h" 10 #include "ash/wm/maximize_bubble_controller.h"
11 #include "ash/wm/property_util.h" 11 #include "ash/wm/property_util.h"
12 #include "ash/wm/workspace/phantom_window_controller.h" 12 #include "ash/wm/workspace/phantom_window_controller.h"
13 #include "ash/wm/workspace/snap_sizer.h" 13 #include "ash/wm/workspace/snap_sizer.h"
14 #include "grit/ash_strings.h" 14 #include "grit/ash_strings.h"
15 #include "grit/ui_resources.h"
16 #include "ui/aura/event_filter.h" 15 #include "ui/aura/event_filter.h"
17 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
18 #include "ui/base/events/event.h" 17 #include "ui/base/events/event.h"
19 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/gfx/image/image.h" 20 #include "ui/gfx/image/image.h"
22 #include "ui/gfx/screen.h" 21 #include "ui/gfx/screen.h"
23 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
24 #include "ui/views/window/non_client_view.h" 23 #include "ui/views/window/non_client_view.h"
25 24
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 return FRAME_STATE_SNAP_LEFT; 568 return FRAME_STATE_SNAP_LEFT;
570 if (bounds.right() == screen.right()) 569 if (bounds.right() == screen.right())
571 return FRAME_STATE_SNAP_RIGHT; 570 return FRAME_STATE_SNAP_RIGHT;
572 // If we come here, it is likely caused by the fact that the 571 // If we come here, it is likely caused by the fact that the
573 // "VerticalResizeDoubleClick" stored a restore rectangle. In that case 572 // "VerticalResizeDoubleClick" stored a restore rectangle. In that case
574 // we allow all maximize operations (and keep the restore rectangle). 573 // we allow all maximize operations (and keep the restore rectangle).
575 return FRAME_STATE_NONE; 574 return FRAME_STATE_NONE;
576 } 575 }
577 576
578 } // namespace ash 577 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/shadow.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698