OLD | NEW |
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 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" | 5 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h" |
6 | 6 |
7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/extensions/app_icon_loader_impl.h" | 9 #include "chrome/browser/extensions/app_icon_loader_impl.h" |
10 #include "chrome/browser/extensions/bookmark_app_helper.h" | 10 #include "chrome/browser/extensions/bookmark_app_helper.h" |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 void BookmarkAppBubbleView::WindowClosing() { | 201 void BookmarkAppBubbleView::WindowClosing() { |
202 // We have to reset |bookmark_app_bubble_| here, not in our destructor, | 202 // We have to reset |bookmark_app_bubble_| here, not in our destructor, |
203 // because we'll be destroyed asynchronously and the shown state will be | 203 // because we'll be destroyed asynchronously and the shown state will be |
204 // checked before then. | 204 // checked before then. |
205 DCHECK_EQ(bookmark_app_bubble_, this); | 205 DCHECK_EQ(bookmark_app_bubble_, this); |
206 bookmark_app_bubble_ = NULL; | 206 bookmark_app_bubble_ = NULL; |
207 | 207 |
208 if (remove_app_) { | 208 if (remove_app_) { |
209 GetExtensionService(profile_)->UninstallExtension( | 209 GetExtensionService(profile_)->UninstallExtension( |
210 extension_id_, | 210 extension_id_, |
211 ExtensionService::UNINSTALL_REASON_INSTALL_CANCELED, | 211 extensions::UninstalledExtensionInfo::REASON_INSTALL_CANCELED, |
212 NULL); | 212 NULL); |
213 } else { | 213 } else { |
214 ApplyEdits(); | 214 ApplyEdits(); |
215 } | 215 } |
216 } | 216 } |
217 | 217 |
218 bool BookmarkAppBubbleView::AcceleratorPressed( | 218 bool BookmarkAppBubbleView::AcceleratorPressed( |
219 const ui::Accelerator& accelerator) { | 219 const ui::Accelerator& accelerator) { |
220 if (accelerator.key_code() == ui::VKEY_RETURN) { | 220 if (accelerator.key_code() == ui::VKEY_RETURN) { |
221 HandleButtonPressed(add_button_); | 221 HandleButtonPressed(add_button_); |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 if (extension && base::UTF8ToUTF16(extension->name()) == title_tf_->text()) | 267 if (extension && base::UTF8ToUTF16(extension->name()) == title_tf_->text()) |
268 return; | 268 return; |
269 | 269 |
270 // Reinstall the app with an updated name. | 270 // Reinstall the app with an updated name. |
271 WebApplicationInfo install_info(web_app_info_); | 271 WebApplicationInfo install_info(web_app_info_); |
272 install_info.title = title_tf_->text(); | 272 install_info.title = title_tf_->text(); |
273 | 273 |
274 extensions::CreateOrUpdateBookmarkApp(GetExtensionService(profile_), | 274 extensions::CreateOrUpdateBookmarkApp(GetExtensionService(profile_), |
275 install_info); | 275 install_info); |
276 } | 276 } |
OLD | NEW |