ash/wm/caption_buttons/frame_caption_button_container_view.cc - Issue 23498031: Move code related to the window controls to ash/wm/caption_buttons

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/wm/caption_buttons/frame_caption_button_container_view.cc

Issue 23498031: Move code related to the window controls to ash/wm/caption_buttons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 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/caption_buttons/frame_caption_button_container_view.h ('k') | ash/wm/caption_buttons/frame_caption_button_container_view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_caption_button_container_view.h"	5 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ash/shell_delegate.h"	9 #include "ash/shell_delegate.h"

	10 #include "ash/wm/caption_buttons/alternate_frame_caption_button.h"

	11 #include "ash/wm/caption_buttons/frame_maximize_button.h"

10 #include "ash/wm/window_settings.h"	12 #include "ash/wm/window_settings.h"

11 #include "ash/wm/workspace/alternate_frame_caption_button.h"

12 #include "ash/wm/workspace/frame_maximize_button.h"

13 #include "grit/ash_resources.h"	13 #include "grit/ash_resources.h"

14 #include "grit/ui_strings.h" // Accessibility names	14 #include "grit/ui_strings.h" // Accessibility names

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

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

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

18 #include "ui/compositor/scoped_animation_duration_scale_mode.h"	18 #include "ui/compositor/scoped_animation_duration_scale_mode.h"

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

20 #include "ui/views/border.h"	20 #include "ui/views/border.h"

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

22 #include "ui/views/widget/widget.h"	22 #include "ui/views/widget/widget.h"

(...skipping 326 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
349 ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();	349 ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();

350 image_button->SetImage(views::CustomButton::STATE_NORMAL,	350 image_button->SetImage(views::CustomButton::STATE_NORMAL,

351 resource_bundle.GetImageSkiaNamed(normal_image_id));	351 resource_bundle.GetImageSkiaNamed(normal_image_id));

352 image_button->SetImage(views::CustomButton::STATE_HOVERED,	352 image_button->SetImage(views::CustomButton::STATE_HOVERED,

353 resource_bundle.GetImageSkiaNamed(hot_image_id));	353 resource_bundle.GetImageSkiaNamed(hot_image_id));

354 image_button->SetImage(views::CustomButton::STATE_PRESSED,	354 image_button->SetImage(views::CustomButton::STATE_PRESSED,

355 resource_bundle.GetImageSkiaNamed(pushed_image_id));	355 resource_bundle.GetImageSkiaNamed(pushed_image_id));

356 }	356 }

357	357

358 } // namespace ash	358 } // namespace ash

OLD	NEW