chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 10826219: launcher: Fix include paths and header guards.

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: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

Issue 10826219: launcher: Fix include paths and header guards. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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 | « chrome/browser/ui/ash/launcher/launcher_context_menu.h ('k') | chrome/browser/ui/ash/launcher/launcher_favicon_loader.h » ('j') | no next file with comments »

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 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"	5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

6	6

7 #include "ash/launcher/launcher_context_menu.h"	7 #include "ash/launcher/launcher_context_menu.h"

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

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

10 #include "chrome/browser/extensions/extension_prefs.h"	10 #include "chrome/browser/extensions/extension_prefs.h"

11 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"	11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

12 #include "chrome/common/chrome_switches.h"	12 #include "chrome/common/chrome_switches.h"

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

14 #include "grit/generated_resources.h"	14 #include "grit/generated_resources.h"

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

16	16

17 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,	17 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,

18 const ash::LauncherItem* item)	18 const ash::LauncherItem* item)

19 : ui::SimpleMenuModel(NULL),	19 : ui::SimpleMenuModel(NULL),

20 controller_(controller),	20 controller_(controller),

21 item_(item ? *item : ash::LauncherItem()) {	21 item_(item ? *item : ash::LauncherItem()) {

(...skipping 128 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
150 case MENU_NEW_WINDOW:	150 case MENU_NEW_WINDOW:

151 controller_->CreateNewWindow();	151 controller_->CreateNewWindow();

152 break;	152 break;

153 case MENU_NEW_INCOGNITO_WINDOW:	153 case MENU_NEW_INCOGNITO_WINDOW:

154 controller_->CreateNewIncognitoWindow();	154 controller_->CreateNewIncognitoWindow();

155 break;	155 break;

156 case MENU_ALIGNMENT_MENU:	156 case MENU_ALIGNMENT_MENU:

157 break;	157 break;

158 }	158 }

159 }	159 }

OLD	NEW