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

Side by Side Diff: apps/ui/views/app_window_frame_view.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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 | « no previous file | chrome/browser/download/drag_download_item_views.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "apps/ui/views/app_window_frame_view.h" 5 #include "apps/ui/views/app_window_frame_view.h"
6 6
7 #include "apps/ui/native_app_window.h" 7 #include "apps/ui/native_app_window.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "extensions/common/draggable_region.h" 9 #include "extensions/common/draggable_region.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
11 #include "grit/ui_strings.h" // Accessibility names 11 #include "grit/ui_strings.h" // Accessibility names
12 #include "third_party/skia/include/core/SkPaint.h" 12 #include "third_party/skia/include/core/SkPaint.h"
13 #include "third_party/skia/include/core/SkRegion.h" 13 #include "third_party/skia/include/core/SkRegion.h"
14 #include "ui/base/hit_test.h" 14 #include "ui/base/hit_test.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
17 #include "ui/gfx/canvas.h" 17 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
19 #include "ui/gfx/path.h" 19 #include "ui/gfx/path.h"
20 #include "ui/views/controls/button/image_button.h" 20 #include "ui/views/controls/button/image_button.h"
21 #include "ui/views/layout/grid_layout.h" 21 #include "ui/views/layout/grid_layout.h"
22 #include "ui/views/views_delegate.h" 22 #include "ui/views/views_delegate.h"
23 #include "ui/views/widget/widget.h" 23 #include "ui/views/widget/widget.h"
24 #include "ui/views/widget/widget_delegate.h" 24 #include "ui/views/widget/widget_delegate.h"
25 25
26 #if defined(USE_AURA)
27 #include "ui/aura/env.h"
28 #include "ui/aura/window.h"
29 #endif
30
31 namespace { 26 namespace {
32 27
33 const int kDefaultResizeInsideBoundsSize = 5; 28 const int kDefaultResizeInsideBoundsSize = 5;
34 const int kDefaultResizeAreaCornerSize = 16; 29 const int kDefaultResizeAreaCornerSize = 16;
35 const int kCaptionHeight = 25; 30 const int kCaptionHeight = 25;
36 31
37 } // namespace 32 } // namespace
38 33
39 namespace apps { 34 namespace apps {
40 35
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 widget_->Close(); 359 widget_->Close();
365 else if (sender == maximize_button_) 360 else if (sender == maximize_button_)
366 widget_->Maximize(); 361 widget_->Maximize();
367 else if (sender == restore_button_) 362 else if (sender == restore_button_)
368 widget_->Restore(); 363 widget_->Restore();
369 else if (sender == minimize_button_) 364 else if (sender == minimize_button_)
370 widget_->Minimize(); 365 widget_->Minimize();
371 } 366 }
372 367
373 } // namespace apps 368 } // namespace apps
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/download/drag_download_item_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698