| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 ColorPickerPopupActionSetValue = 0 | 44 ColorPickerPopupActionSetValue = 0 |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 ColorChooserPopupUIController::ColorChooserPopupUIController( | 47 ColorChooserPopupUIController::ColorChooserPopupUIController( |
| 48 LocalFrame* frame, | 48 LocalFrame* frame, |
| 49 ChromeClientImpl* chromeClient, | 49 ChromeClientImpl* chromeClient, |
| 50 ColorChooserClient* client) | 50 ColorChooserClient* client) |
| 51 : ColorChooserUIController(frame, client), | 51 : ColorChooserUIController(frame, client), |
| 52 m_chromeClient(chromeClient), | 52 m_chromeClient(chromeClient), |
| 53 m_popup(nullptr), | 53 m_popup(nullptr), |
| 54 m_locale(Locale::defaultLocale()) { | 54 m_locale(Locale::defaultLocale()) {} |
| 55 } | |
| 56 | 55 |
| 57 ColorChooserPopupUIController::~ColorChooserPopupUIController() {} | 56 ColorChooserPopupUIController::~ColorChooserPopupUIController() {} |
| 58 | 57 |
| 59 void ColorChooserPopupUIController::dispose() { | 58 void ColorChooserPopupUIController::dispose() { |
| 60 // Finalized earlier so as to access m_chromeClient while alive. | 59 // Finalized earlier so as to access m_chromeClient while alive. |
| 61 closePopup(); | 60 closePopup(); |
| 62 // ~ColorChooserUIController calls endChooser(). | 61 // ~ColorChooserUIController calls endChooser(). |
| 63 } | 62 } |
| 64 | 63 |
| 65 DEFINE_TRACE(ColorChooserPopupUIController) { | 64 DEFINE_TRACE(ColorChooserPopupUIController) { |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 m_popup = m_chromeClient->openPagePopup(this); | 152 m_popup = m_chromeClient->openPagePopup(this); |
| 154 } | 153 } |
| 155 | 154 |
| 156 void ColorChooserPopupUIController::closePopup() { | 155 void ColorChooserPopupUIController::closePopup() { |
| 157 if (!m_popup) | 156 if (!m_popup) |
| 158 return; | 157 return; |
| 159 m_chromeClient->closePagePopup(m_popup); | 158 m_chromeClient->closePagePopup(m_popup); |
| 160 } | 159 } |
| 161 | 160 |
| 162 } // namespace blink | 161 } // namespace blink |
| OLD | NEW |