diff options
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r-- | chrome/browser/geolocation/geolocation_exceptions_table_model.cc | 4 | ||||
-rw-r--r-- | chrome/browser/geolocation/geolocation_exceptions_table_model.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/geolocation/geolocation_exceptions_table_model.cc b/chrome/browser/geolocation/geolocation_exceptions_table_model.cc index 9bd57fe..c642657 100644 --- a/chrome/browser/geolocation/geolocation_exceptions_table_model.cc +++ b/chrome/browser/geolocation/geolocation_exceptions_table_model.cc @@ -6,11 +6,11 @@ #include "app/l10n_util.h" #include "app/l10n_util_collator.h" -#include "app/table_model_observer.h" #include "base/utf_string_conversions.h" #include "chrome/common/content_settings_helper.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/models/table_model_observer.h" namespace { // Return -1, 0, or 1 depending on whether |origin1| should be sorted before, @@ -180,7 +180,7 @@ string16 GeolocationExceptionsTableModel::GetText(int row, } void GeolocationExceptionsTableModel::SetObserver( - TableModelObserver* observer) { + ui::TableModelObserver* observer) { observer_ = observer; } diff --git a/chrome/browser/geolocation/geolocation_exceptions_table_model.h b/chrome/browser/geolocation/geolocation_exceptions_table_model.h index d1223e6..0617b46 100644 --- a/chrome/browser/geolocation/geolocation_exceptions_table_model.h +++ b/chrome/browser/geolocation/geolocation_exceptions_table_model.h @@ -40,7 +40,7 @@ class GeolocationExceptionsTableModel : public RemoveRowsTableModel { // TableModel overrides: virtual int RowCount() OVERRIDE; virtual string16 GetText(int row, int column_id) OVERRIDE; - virtual void SetObserver(TableModelObserver* observer) OVERRIDE; + virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE; private: @@ -54,7 +54,7 @@ class GeolocationExceptionsTableModel : public RemoveRowsTableModel { typedef std::vector<Entry> EntriesVector; EntriesVector entries_; - TableModelObserver* observer_; + ui::TableModelObserver* observer_; DISALLOW_COPY_AND_ASSIGN(GeolocationExceptionsTableModel); }; |