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

Side by Side Diff: chrome/browser/web_applications/update_shortcut_worker_win.h

Issue 1038573002: Fixed thread-unsafe use of gfx::Image in app shortcut creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_ 5 #ifndef CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_
6 #define CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_ 6 #define CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_
7 7
8 #include "chrome/browser/shell_integration.h" 8 #include "chrome/browser/shell_integration.h"
9 #include "chrome/browser/web_applications/web_app.h" 9 #include "chrome/browser/web_applications/web_app.h"
10 #include "content/public/browser/notification_observer.h" 10 #include "content/public/browser/notification_observer.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 content::NotificationRegistrar registrar_; 64 content::NotificationRegistrar registrar_;
65 65
66 // Underlying WebContents whose shortcuts will be updated. 66 // Underlying WebContents whose shortcuts will be updated.
67 content::WebContents* web_contents_; 67 content::WebContents* web_contents_;
68 68
69 // Icons info from web_contents_'s web app data. 69 // Icons info from web_contents_'s web app data.
70 web_app::IconInfoList unprocessed_icons_; 70 web_app::IconInfoList unprocessed_icons_;
71 71
72 // Cached shortcut data from the web_contents_. 72 // Cached shortcut data from the web_contents_.
73 web_app::ShortcutInfo shortcut_info_; 73 scoped_ptr<web_app::ShortcutInfo> shortcut_info_;
74 74
75 // Our copy of profile path. 75 // Our copy of profile path.
76 base::FilePath profile_path_; 76 base::FilePath profile_path_;
77 77
78 // File name of shortcut/ico file based on app title. 78 // File name of shortcut/ico file based on app title.
79 base::FilePath file_name_; 79 base::FilePath file_name_;
80 80
81 // Existing shortcuts. 81 // Existing shortcuts.
82 std::vector<base::FilePath> shortcut_files_; 82 std::vector<base::FilePath> shortcut_files_;
83 83
84 DISALLOW_COPY_AND_ASSIGN(UpdateShortcutWorker); 84 DISALLOW_COPY_AND_ASSIGN(UpdateShortcutWorker);
85 }; 85 };
86 86
87 } // namespace web_app 87 } // namespace web_app
88 88
89 #endif // CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_ 89 #endif // CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698