apps/ui/views/app_window_frame_view.cc - Issue 1159033008: Refactor ViewsDelegate singleton

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

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Destroy ash ViewsDelegate Created 5 years, 6 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

« no previous file with comments | « no previous file | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "extensions/browser/app_window/native_app_window.h"	8 #include "extensions/browser/app_window/native_app_window.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 "third_party/skia/include/core/SkPaint.h"	11 #include "third_party/skia/include/core/SkPaint.h"

12 #include "third_party/skia/include/core/SkRegion.h"	12 #include "third_party/skia/include/core/SkRegion.h"

13 #include "ui/base/hit_test.h"	13 #include "ui/base/hit_test.h"

14 #include "ui/base/l10n/l10n_util.h"	14 #include "ui/base/l10n/l10n_util.h"

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/gfx/canvas.h"	16 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/color_utils.h"	17 #include "ui/gfx/color_utils.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/strings/grit/ui_strings.h" // Accessibility names	20 #include "ui/strings/grit/ui_strings.h" // Accessibility names

21 #include "ui/views/controls/button/image_button.h"	21 #include "ui/views/controls/button/image_button.h"

22 #include "ui/views/layout/grid_layout.h"	22 #include "ui/views/layout/grid_layout.h"

23 #include "ui/views/views_delegate.h"

24 #include "ui/views/widget/widget.h"	23 #include "ui/views/widget/widget.h"

25 #include "ui/views/widget/widget_delegate.h"	24 #include "ui/views/widget/widget_delegate.h"

26	25

27 namespace {	26 namespace {

28	27

29 const int kDefaultResizeInsideBoundsSize = 5;	28 const int kDefaultResizeInsideBoundsSize = 5;

30 const int kDefaultResizeAreaCornerSize = 16;	29 const int kDefaultResizeAreaCornerSize = 16;

31 const int kCaptionHeight = 25;	30 const int kCaptionHeight = 25;

32	31

33 } // namespace	32 } // namespace

(...skipping 364 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
398 restore_button_->SetImage(	397 restore_button_->SetImage(

399 views::CustomButton::STATE_NORMAL,	398 views::CustomButton::STATE_NORMAL,

400 rb.GetNativeImageNamed(IDR_APP_WINDOW_RESTORE).ToImageSkia());	399 rb.GetNativeImageNamed(IDR_APP_WINDOW_RESTORE).ToImageSkia());

401 minimize_button_->SetImage(	400 minimize_button_->SetImage(

402 views::CustomButton::STATE_NORMAL,	401 views::CustomButton::STATE_NORMAL,

403 rb.GetNativeImageNamed(IDR_APP_WINDOW_MINIMIZE).ToImageSkia());	402 rb.GetNativeImageNamed(IDR_APP_WINDOW_MINIMIZE).ToImageSkia());

404 }	403 }

405 }	404 }

406	405

407 } // namespace apps	406 } // namespace apps

OLD	NEW