| Index: chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
|
| index 24082278122035e8ba55053d74d58d3a71a2bc3e..a68146726f4aa965ac211a1ff4c8aa8c7d0657cf 100644
|
| --- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
|
| +++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
|
| @@ -12,7 +12,7 @@
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
|
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
|
| +#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/grit/generated_resources.h"
|
| @@ -29,7 +29,7 @@ bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
|
| } // namespace
|
|
|
| ExtensionLauncherContextMenu::ExtensionLauncherContextMenu(
|
| - ChromeLauncherController* controller,
|
| + ChromeLauncherControllerImpl* controller,
|
| const ash::ShelfItem* item,
|
| ash::WmShelf* wm_shelf)
|
| : LauncherContextMenu(controller, item, wm_shelf) {
|
| @@ -40,7 +40,7 @@ ExtensionLauncherContextMenu::~ExtensionLauncherContextMenu() {}
|
|
|
| void ExtensionLauncherContextMenu::Init() {
|
| extension_items_.reset(new extensions::ContextMenuMatcher(
|
| - controller()->profile(), this, this,
|
| + controller()->GetProfile(), this, this,
|
| base::Bind(MenuItemHasLauncherContext)));
|
| if (item().type == ash::TYPE_APP_SHORTCUT ||
|
| item().type == ash::TYPE_WINDOWED_APP) {
|
| @@ -77,7 +77,7 @@ void ExtensionLauncherContextMenu::Init() {
|
| }
|
| } else if (item().type == ash::TYPE_BROWSER_SHORTCUT) {
|
| AddItemWithStringId(MENU_NEW_WINDOW, IDS_APP_LIST_NEW_WINDOW);
|
| - if (!controller()->profile()->IsGuestSession()) {
|
| + if (!controller()->GetProfile()->IsGuestSession()) {
|
| AddItemWithStringId(MENU_NEW_INCOGNITO_WINDOW,
|
| IDS_APP_LIST_NEW_INCOGNITO_WINDOW);
|
| }
|
| @@ -170,12 +170,12 @@ bool ExtensionLauncherContextMenu::IsCommandIdEnabled(int command_id) const {
|
| case MENU_NEW_WINDOW:
|
| // "Normal" windows are not allowed when incognito is enforced.
|
| return IncognitoModePrefs::GetAvailability(
|
| - controller()->profile()->GetPrefs()) !=
|
| + controller()->GetProfile()->GetPrefs()) !=
|
| IncognitoModePrefs::FORCED;
|
| case MENU_NEW_INCOGNITO_WINDOW:
|
| // Incognito windows are not allowed when incognito is disabled.
|
| return IncognitoModePrefs::GetAvailability(
|
| - controller()->profile()->GetPrefs()) !=
|
| + controller()->GetProfile()->GetPrefs()) !=
|
| IncognitoModePrefs::DISABLED;
|
| default:
|
| if (command_id < MENU_ITEM_COUNT)
|
| @@ -214,10 +214,11 @@ void ExtensionLauncherContextMenu::ExecuteCommand(int command_id,
|
| extensions::LAUNCH_TYPE_FULLSCREEN);
|
| break;
|
| case MENU_NEW_WINDOW:
|
| - chrome::NewEmptyWindow(controller()->profile());
|
| + chrome::NewEmptyWindow(controller()->GetProfile());
|
| break;
|
| case MENU_NEW_INCOGNITO_WINDOW:
|
| - chrome::NewEmptyWindow(controller()->profile()->GetOffTheRecordProfile());
|
| + chrome::NewEmptyWindow(
|
| + controller()->GetProfile()->GetOffTheRecordProfile());
|
| break;
|
| default:
|
| if (extension_items_) {
|
|
|