Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Unified Diff: chrome/browser/ui/views/ash/launcher/launcher_context_menu.h

Issue 10388036: Adds the option of aligning the launcher to the left or right. There (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/ash/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/views/ash/launcher/launcher_context_menu.h
index f02e1db97abf3a7467d5d5e677def76cc3af6195..0cb1395a3bb98901ec18d2888263cd128f2545f0 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/views/ash/launcher/launcher_context_menu.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_VIEWS_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
#pragma once
+#include "ash/launcher/launcher_alignment_menu.h"
#include "ash/launcher/launcher_types.h"
#include "base/basictypes.h"
#include "ui/base/models/simple_menu_model.h"
@@ -44,7 +45,8 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
LAUNCH_TYPE_WINDOW,
MENU_AUTO_HIDE,
MENU_NEW_WINDOW,
- MENU_NEW_INCOGNITO_WINDOW
+ MENU_NEW_INCOGNITO_WINDOW,
+ MENU_ALIGNMENT_MENU,
};
// Does |item_| represent a valid item? See description of constructor for
@@ -52,8 +54,11 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
bool is_valid_item() const { return item_.id != 0; }
ChromeLauncherController* controller_;
+
ash::LauncherItem item_;
+ ash::LauncherAlignmentMenu alignment_menu_;
+
DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
};
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/views/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698