chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc - Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer

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

Unified Diff: chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix

Patch Set: fix win compile, change LOG(INFO)s to VLOG(1) Created 7 years 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/ui/gtk/create_application_shortcuts_dialog_gtk.h ('k') | chrome/browser/ui/views/app_list/win/app_list_service_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

index 1c562c175e7520ca7bbf76f937dd7fd81308c6a1..3e26bcb624035d6756815de704d081c4f3a5bc11 100644

--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

@@ -212,9 +212,12 @@ void CreateApplicationShortcutsDialogGtk::OnCreateDialogResponse(

ShellIntegration::ShortcutLocations creation_locations;

creation_locations.on_desktop =

gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(desktop_checkbox_));

- creation_locations.in_applications_menu =

- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_));

- creation_locations.applications_menu_subdir = shortcut_menu_subdir_;

+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(menu_checkbox_))) {

+ creation_locations.applications_menu_location =

+ create_in_chrome_apps_subdir_ ?

+ ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS :

+ ShellIntegration::APP_MENU_LOCATION_ROOT;

+ }

BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,

base::Bind(&CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut,

this, shortcut_info_, creation_locations));

@@ -300,8 +303,8 @@ CreateWebApplicationShortcutsDialogGtk::CreateWebApplicationShortcutsDialogGtk(

web_app::GetShortcutInfoForTab(web_contents, &shortcut_info_);

CreateIconPixBuf(shortcut_info_.favicon);

- // NOTE: Leave shortcut_menu_subdir_ blank to create URL app shortcuts in the

- // top-level menu.

+ // Create URL app shortcuts in the top-level menu.

+ create_in_chrome_apps_subdir_ = false;

CreateDialogBox(parent);

}

@@ -324,7 +327,7 @@ CreateChromeApplicationShortcutsDialogGtk::

close_callback_(close_callback) {

// Place Chrome app shortcuts in the "Chrome Apps" submenu.

- shortcut_menu_subdir_ = web_app::GetAppShortcutsSubdirName();

+ create_in_chrome_apps_subdir_ = true;

// Get shortcut information and icon now; they are needed for our UI.

web_app::UpdateShortcutInfoAndIconForApp(