Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / website_settings / permission_menu_model.h

diff --git a/src/chrome/browser/ui/website_settings/permission_menu_model.h b/src/chrome/browser/ui/website_settings/permission_menu_model.h
index 0754f71..5270707 100644 (file)
--- a/src/chrome/browser/ui/website_settings/permission_menu_model.h
+++ b/src/chrome/browser/ui/website_settings/permission_menu_model.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_MENU_MODEL_H_
 
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
-#include "chrome/common/content_settings.h"
-#include "chrome/common/content_settings_types.h"
+#include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "url/gurl.h"
 
@@ -28,15 +28,14 @@ class PermissionMenuModel : public ui::SimpleMenuModel,
   PermissionMenuModel(const GURL& url,
                       ContentSetting setting,
                       const ChangeCallback& callback);
-  virtual ~PermissionMenuModel();
+  ~PermissionMenuModel() override;
 
   // Overridden from ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+  bool IsCommandIdChecked(int command_id) const override;
+  bool IsCommandIdEnabled(int command_id) const override;
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override;
+  void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   // The permission info represented by the menu model.