| Index: chrome/browser/ui/cocoa/create_application_shortcut_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/create_application_shortcut_cocoa.mm b/chrome/browser/ui/cocoa/create_application_shortcut_cocoa.mm
|
| index a46a263a568158c5c33a1e7da0a77556e18700f3..b0bcb1cd888d40305401f3e44d60a5330d91e5ba 100644
|
| --- a/chrome/browser/ui/cocoa/create_application_shortcut_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/create_application_shortcut_cocoa.mm
|
| @@ -4,14 +4,16 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| -#import "base/mac/scoped_nsobject.h"
|
| -#import "chrome/browser/web_applications/web_app_mac.h"
|
| -#import "ui/base/l10n/l10n_util_mac.h"
|
| #include "base/bind.h"
|
| +#import "base/mac/scoped_nsobject.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/ui/cocoa/browser_dialogs_views_mac.h"
|
| #include "chrome/browser/ui/cocoa/key_equivalent_constants.h"
|
| +#import "chrome/browser/web_applications/web_app_mac.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/strings/grit/components_strings.h"
|
| +#import "ui/base/l10n/l10n_util_mac.h"
|
| +#include "ui/base/material_design/material_design_controller.h"
|
| #include "ui/gfx/image/image.h"
|
|
|
| @interface CrCreateAppShortcutCheckboxObserver : NSObject {
|
| @@ -80,7 +82,8 @@ void CreateAppShortcutInfoLoaded(
|
| [[NSButton alloc] initWithFrame:NSZeroRect]);
|
| [application_folder_checkbox setButtonType:NSSwitchButton];
|
| [application_folder_checkbox
|
| - setTitle:l10n_util::GetNSString(IDS_CREATE_SHORTCUTS_APP_FOLDER_CHKBOX)];
|
| + setTitle:l10n_util::GetNSString(
|
| + IDS_CREATE_SHORTCUTS_APPLICATIONS_CHKBOX)];
|
| [application_folder_checkbox setState:NSOnState];
|
| [application_folder_checkbox sizeToFit];
|
|
|
| @@ -123,10 +126,16 @@ void CreateAppShortcutInfoLoaded(
|
| namespace chrome {
|
|
|
| void ShowCreateChromeAppShortcutsDialog(
|
| - gfx::NativeWindow /*parent_window*/,
|
| + gfx::NativeWindow parent_window,
|
| Profile* profile,
|
| const extensions::Extension* app,
|
| const base::Callback<void(bool)>& close_callback) {
|
| + if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
|
| + ShowCreateChromeAppShortcutsDialogViews(parent_window, profile, app,
|
| + close_callback);
|
| + return;
|
| + }
|
| +
|
| web_app::GetShortcutInfoForApp(
|
| app, profile,
|
| base::Bind(&CreateAppShortcutInfoLoaded, profile, app, close_callback));
|
|
|