| 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 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h" | 5 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h" |
| 6 | 6 |
| 7 #include "base/mac/scoped_nsautorelease_pool.h" | 7 #include "base/mac/scoped_nsautorelease_pool.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| 11 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h" | 11 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h" |
| 12 #include "chrome/browser/apps/app_window_registry_util.h" | 12 #include "chrome/browser/apps/app_window_registry_util.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" | |
| 15 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
| 16 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" |
| 17 #include "chrome/grit/generated_resources.h" | 17 #include "chrome/grit/generated_resources.h" |
| 18 #include "extensions/browser/app_window/app_window.h" | 18 #include "extensions/browser/app_window/app_window.h" |
| 19 #include "extensions/common/extension.h" | 19 #include "extensions/common/extension.h" |
| 20 #include "ui/base/l10n/l10n_util.h" | 20 #include "ui/base/l10n/l10n_util.h" |
| 21 #include "ui/base/l10n/l10n_util_mac.h" | 21 #include "ui/base/l10n/l10n_util_mac.h" |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 // Gets an item from the main menu given the tag of the top level item | 25 // Gets an item from the main menu given the tag of the top level item |
| 26 // |menu_tag| and the tag of the item |item_tag|. | 26 // |menu_tag| and the tag of the item |item_tag|. |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 | 515 |
| 516 - (void)focusCurrentPlatformApp { | 516 - (void)focusCurrentPlatformApp { |
| 517 extensions::AppWindow* appWindow = | 517 extensions::AppWindow* appWindow = |
| 518 AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile( | 518 AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile( |
| 519 [NSApp keyWindow]); | 519 [NSApp keyWindow]); |
| 520 if (appWindow) | 520 if (appWindow) |
| 521 apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow); | 521 apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow); |
| 522 } | 522 } |
| 523 | 523 |
| 524 @end | 524 @end |
| OLD | NEW |