| 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/intents/web_intent_picker_controller.h" | 5 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "chrome/browser/webdata/web_data_service.h" | 28 #include "chrome/browser/webdata/web_data_service.h" |
| 29 #include "chrome/common/chrome_notification_types.h" | 29 #include "chrome/common/chrome_notification_types.h" |
| 30 #include "chrome/common/url_constants.h" | 30 #include "chrome/common/url_constants.h" |
| 31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 #include "content/public/browser/navigation_controller.h" | 32 #include "content/public/browser/navigation_controller.h" |
| 33 #include "content/public/browser/notification_source.h" | 33 #include "content/public/browser/notification_source.h" |
| 34 #include "content/public/browser/web_contents.h" | 34 #include "content/public/browser/web_contents.h" |
| 35 #include "content/public/browser/web_intents_dispatcher.h" | 35 #include "content/public/browser/web_intents_dispatcher.h" |
| 36 #include "content/public/common/url_fetcher.h" | 36 #include "content/public/common/url_fetcher.h" |
| 37 #include "grit/generated_resources.h" | 37 #include "grit/generated_resources.h" |
| 38 #include "ipc/ipc_message.h" |
| 38 #include "net/base/load_flags.h" | 39 #include "net/base/load_flags.h" |
| 39 #include "net/url_request/url_fetcher_delegate.h" | 40 #include "net/url_request/url_fetcher_delegate.h" |
| 40 #include "skia/ext/image_operations.h" | 41 #include "skia/ext/image_operations.h" |
| 41 #include "ui/base/l10n/l10n_util.h" | 42 #include "ui/base/l10n/l10n_util.h" |
| 42 #include "ui/gfx/codec/png_codec.h" | 43 #include "ui/gfx/codec/png_codec.h" |
| 43 #include "ui/gfx/favicon_size.h" | 44 #include "ui/gfx/favicon_size.h" |
| 44 #include "ui/gfx/image/image.h" | 45 #include "ui/gfx/image/image.h" |
| 45 #include "webkit/glue/web_intent_service_data.h" | 46 #include "webkit/glue/web_intent_service_data.h" |
| 46 | 47 |
| 47 namespace { | 48 namespace { |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 // If picker is non-NULL, it was set by a test. | 690 // If picker is non-NULL, it was set by a test. |
| 690 if (picker_ == NULL) | 691 if (picker_ == NULL) |
| 691 picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get()); | 692 picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get()); |
| 692 picker_shown_ = true; | 693 picker_shown_ = true; |
| 693 } | 694 } |
| 694 | 695 |
| 695 void WebIntentPickerController::ClosePicker() { | 696 void WebIntentPickerController::ClosePicker() { |
| 696 if (picker_) | 697 if (picker_) |
| 697 picker_->Close(); | 698 picker_->Close(); |
| 698 } | 699 } |
| OLD | NEW |