trunk/src/chrome/browser/ui/ash/launcher/launcher_item_controller.h - Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

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: trunk/src/chrome/browser/ui/ash/launcher/launcher_item_controller.h

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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 | « trunk/src/chrome/browser/ui/app_list/search/webstore/webstore_result.cc ('k') | trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 (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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_	5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_

6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_	6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_

7	7

8 #include "ash/launcher/launcher_types.h"	8 #include "ash/launcher/launcher_types.h"

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

11 #include "base/memory/scoped_vector.h"	11 #include "base/memory/scoped_vector.h"

12 #include "base/strings/string16.h"	12 #include "base/strings/string16.h"

13 #include "ui/events/event.h"

14	13

15 class ChromeLauncherController;	14 class ChromeLauncherController;

16 class ChromeLauncherAppMenuItem;	15 class ChromeLauncherAppMenuItem;

17	16

18 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;	17 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;

19	18

20 namespace aura {	19 namespace aura {

21 class Window;	20 class Window;

22 }	21 }

23	22

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 // applications.	119 // applications.

121 int locked_;	120 int locked_;

122	121

123 // Set to true if the launcher item image has been set by the controller.	122 // Set to true if the launcher item image has been set by the controller.

124 bool image_set_by_controller_;	123 bool image_set_by_controller_;

125	124

126 DISALLOW_COPY_AND_ASSIGN(LauncherItemController);	125 DISALLOW_COPY_AND_ASSIGN(LauncherItemController);

127 };	126 };

128	127

129 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_	128 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_

OLD	NEW