ash/shelf/shelf_button.cc - Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS.

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/shelf/shelf_button.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix broken relative include. Created 4 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 | « ash/shelf/overflow_button.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

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/shelf/shelf_button.h"	5 #include "ash/shelf/shelf_button.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "ash/ash_switches.h"

10 #include "ash/common/ash_constants.h"	9 #include "ash/common/ash_constants.h"

	10 #include "ash/common/ash_switches.h"

11 #include "ash/common/material_design/material_design_controller.h"	11 #include "ash/common/material_design/material_design_controller.h"

12 #include "ash/common/shelf/shelf_constants.h"	12 #include "ash/common/shelf/shelf_constants.h"

13 #include "ash/shelf/ink_drop_button_listener.h"	13 #include "ash/shelf/ink_drop_button_listener.h"

14 #include "ash/shelf/shelf.h"	14 #include "ash/shelf/shelf.h"

15 #include "ash/shelf/shelf_view.h"	15 #include "ash/shelf/shelf_view.h"

16 #include "base/time/time.h"	16 #include "base/time/time.h"

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

18 #include "skia/ext/image_operations.h"	18 #include "skia/ext/image_operations.h"

19 #include "third_party/skia/include/core/SkPaint.h"	19 #include "third_party/skia/include/core/SkPaint.h"

20 #include "ui/accessibility/ax_view_state.h"	20 #include "ui/accessibility/ax_view_state.h"

(...skipping 551 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
572 views::ImageView::TRAILING));	572 views::ImageView::TRAILING));

573 bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment(	573 bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment(

574 views::ImageView::TRAILING, views::ImageView::CENTER,	574 views::ImageView::TRAILING, views::ImageView::CENTER,

575 views::ImageView::CENTER));	575 views::ImageView::CENTER));

576 bar_->SchedulePaint();	576 bar_->SchedulePaint();

577 }	577 }

578 bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);	578 bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);

579 }	579 }

580	580

581 } // namespace ash	581 } // namespace ash

OLD	NEW