OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h" | 5 #include "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
| 9 #include "apps/shell_integration.h" |
| 10 #include "apps/shell_integration_linux.h" |
9 #include "base/bind.h" | 11 #include "base/bind.h" |
10 #include "base/environment.h" | 12 #include "base/environment.h" |
11 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/shell_integration.h" | |
14 #include "chrome/browser/shell_integration_linux.h" | |
15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/browser_commands.h" | 16 #include "chrome/browser/ui/browser_commands.h" |
17 #include "chrome/browser/ui/browser_dialogs.h" | 17 #include "chrome/browser/ui/browser_dialogs.h" |
18 #include "chrome/browser/ui/browser_finder.h" | 18 #include "chrome/browser/ui/browser_finder.h" |
19 #include "chrome/browser/ui/gtk/gtk_util.h" | 19 #include "chrome/browser/ui/gtk/gtk_util.h" |
20 #include "chrome/browser/ui/web_applications/web_app_ui.h" | 20 #include "chrome/browser/ui/web_applications/web_app_ui.h" |
21 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 21 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
22 #include "chrome/browser/web_applications/web_app.h" | 22 #include "chrome/browser/web_applications/web_app.h" |
23 #include "chrome/common/extensions/extension.h" | 23 #include "chrome/common/extensions/extension.h" |
24 #include "chrome/common/extensions/extension_resource.h" | 24 #include "chrome/common/extensions/extension_resource.h" |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 373 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
374 | 374 |
375 if (web_app::CreateShortcutsOnFileThread(shortcut_info)) { | 375 if (web_app::CreateShortcutsOnFileThread(shortcut_info)) { |
376 Release(); | 376 Release(); |
377 } else { | 377 } else { |
378 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 378 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
379 base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog, | 379 base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog, |
380 this)); | 380 this)); |
381 } | 381 } |
382 } | 382 } |
OLD | NEW |