| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 void BookmarkAppBubbleView::WindowClosing() { | 191 void BookmarkAppBubbleView::WindowClosing() { |
| 192 // We have to reset |bookmark_app_bubble_| here, not in our destructor, | 192 // We have to reset |bookmark_app_bubble_| here, not in our destructor, |
| 193 // because we'll be destroyed asynchronously and the shown state will be | 193 // because we'll be destroyed asynchronously and the shown state will be |
| 194 // checked before then. | 194 // checked before then. |
| 195 DCHECK_EQ(bookmark_app_bubble_, this); | 195 DCHECK_EQ(bookmark_app_bubble_, this); |
| 196 bookmark_app_bubble_ = NULL; | 196 bookmark_app_bubble_ = NULL; |
| 197 | 197 |
| 198 if (remove_app_) { | 198 if (remove_app_) { |
| 199 profile_->GetExtensionService()->UninstallExtension( | 199 profile_->GetExtensionService()->UninstallExtension( |
| 200 extension_id_, false, NULL); | 200 extension_id_, ExtensionService::kUninstallReasonDefault, NULL); |
| 201 } else { | 201 } else { |
| 202 ApplyEdits(); | 202 ApplyEdits(); |
| 203 } | 203 } |
| 204 } | 204 } |
| 205 | 205 |
| 206 bool BookmarkAppBubbleView::AcceleratorPressed( | 206 bool BookmarkAppBubbleView::AcceleratorPressed( |
| 207 const ui::Accelerator& accelerator) { | 207 const ui::Accelerator& accelerator) { |
| 208 if (accelerator.key_code() == ui::VKEY_RETURN) { | 208 if (accelerator.key_code() == ui::VKEY_RETURN) { |
| 209 HandleButtonPressed(add_button_); | 209 HandleButtonPressed(add_button_); |
| 210 } | 210 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 if (extension && base::UTF8ToUTF16(extension->name()) == title_tf_->text()) | 254 if (extension && base::UTF8ToUTF16(extension->name()) == title_tf_->text()) |
| 255 return; | 255 return; |
| 256 | 256 |
| 257 // Reinstall the app with an updated name. | 257 // Reinstall the app with an updated name. |
| 258 WebApplicationInfo install_info(web_app_info_); | 258 WebApplicationInfo install_info(web_app_info_); |
| 259 install_info.title = title_tf_->text(); | 259 install_info.title = title_tf_->text(); |
| 260 | 260 |
| 261 extensions::CreateOrUpdateBookmarkApp(profile_->GetExtensionService(), | 261 extensions::CreateOrUpdateBookmarkApp(profile_->GetExtensionService(), |
| 262 install_info); | 262 install_info); |
| 263 } | 263 } |
| OLD | NEW |