| Index: chrome/browser/view_type_utils.cc
|
| ===================================================================
|
| --- chrome/browser/view_type_utils.cc (revision 191609)
|
| +++ chrome/browser/view_type_utils.cc (working copy)
|
| @@ -17,27 +17,27 @@
|
|
|
| class ViewTypeUserData : public base::SupportsUserData::Data {
|
| public:
|
| - explicit ViewTypeUserData(ViewType type) : type_(type) {}
|
| + explicit ViewTypeUserData(extensions::ViewType type) : type_(type) {}
|
| virtual ~ViewTypeUserData() {}
|
| - ViewType type() { return type_; }
|
| + extensions::ViewType type() { return type_; }
|
|
|
| private:
|
| - ViewType type_;
|
| + extensions::ViewType type_;
|
| };
|
|
|
| } // namespace
|
|
|
| -ViewType GetViewType(WebContents* tab) {
|
| +extensions::ViewType GetViewType(WebContents* tab) {
|
| if (!tab)
|
| - return VIEW_TYPE_INVALID;
|
| + return extensions::VIEW_TYPE_INVALID;
|
|
|
| ViewTypeUserData* user_data = static_cast<ViewTypeUserData*>(
|
| tab->GetUserData(&kViewTypeUserDataKey));
|
|
|
| - return user_data ? user_data->type() : VIEW_TYPE_INVALID;
|
| + return user_data ? user_data->type() : extensions::VIEW_TYPE_INVALID;
|
| }
|
|
|
| -void SetViewType(WebContents* tab, ViewType type) {
|
| +void SetViewType(WebContents* tab, extensions::ViewType type) {
|
| tab->SetUserData(&kViewTypeUserDataKey,
|
| new ViewTypeUserData(type));
|
| }
|
|
|