Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Side by Side Diff: chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc

Issue 10915079: remove --enable-experimental-extension-apis from packaged app shortcut args (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: is_platform_app data member on ShortcutInfo no longer required Created 8 years, 3 months 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 unified diff | Download patch
OLDNEW
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 "base/bind.h" 9 #include "base/bind.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 Profile* profile, 317 Profile* profile,
318 const Extension* app) 318 const Extension* app)
319 : CreateApplicationShortcutsDialogGtk(parent), 319 : CreateApplicationShortcutsDialogGtk(parent),
320 app_(app), 320 app_(app),
321 profile_path_(profile->GetPath()), 321 profile_path_(profile->GetPath()),
322 ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) { 322 ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
323 323
324 // Get shortcut information now, it's needed for our UI. 324 // Get shortcut information now, it's needed for our UI.
325 shortcut_info_.extension_id = app_->id(); 325 shortcut_info_.extension_id = app_->id();
326 shortcut_info_.extension_path = app_->path(); 326 shortcut_info_.extension_path = app_->path();
327 shortcut_info_.is_platform_app = app_->is_platform_app();
328 shortcut_info_.url = GURL(app_->launch_web_url()); 327 shortcut_info_.url = GURL(app_->launch_web_url());
329 shortcut_info_.title = UTF8ToUTF16(app_->name()); 328 shortcut_info_.title = UTF8ToUTF16(app_->name());
330 shortcut_info_.description = UTF8ToUTF16(app_->description()); 329 shortcut_info_.description = UTF8ToUTF16(app_->description());
331 shortcut_info_.profile_path = profile_path_; 330 shortcut_info_.profile_path = profile_path_;
332 331
333 // Get the icon. 332 // Get the icon.
334 const gfx::Size max_size(kIconPreviewSizePixels, kIconPreviewSizePixels); 333 const gfx::Size max_size(kIconPreviewSizePixels, kIconPreviewSizePixels);
335 ExtensionResource icon_resource = app_->GetIconResource( 334 ExtensionResource icon_resource = app_->GetIconResource(
336 kIconPreviewSizePixels, ExtensionIconSet::MATCH_BIGGER); 335 kIconPreviewSizePixels, ExtensionIconSet::MATCH_BIGGER);
337 336
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 370 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
372 371
373 if (web_app::CreateShortcutsOnFileThread(shortcut_info)) { 372 if (web_app::CreateShortcutsOnFileThread(shortcut_info)) {
374 Release(); 373 Release();
375 } else { 374 } else {
376 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 375 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
377 base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog, 376 base::Bind(&CreateChromeApplicationShortcutsDialogGtk::ShowErrorDialog,
378 this)); 377 this));
379 } 378 }
380 } 379 }
OLDNEW
« no previous file with comments | « chrome/browser/shell_integration_unittest.cc ('k') | chrome/browser/ui/views/create_application_shortcut_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698