Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Side by Side Diff: chrome/browser/ui/views/website_settings/permission_selector_view.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/views/website_settings/permission_selector_view.h" 5 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/website_settings/permission_menu_model.h" 8 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
9 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 9 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
10 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
(...skipping 28 matching lines...) Expand all
39 // of the |model| remains with the caller and is not transfered to the 39 // of the |model| remains with the caller and is not transfered to the
40 // |PermissionMenuButton|. If the |show_menu_marker| flag is true, then a 40 // |PermissionMenuButton|. If the |show_menu_marker| flag is true, then a
41 // small icon is be displayed next to the button |text|, indicating that the 41 // small icon is be displayed next to the button |text|, indicating that the
42 // button opens a drop down menu. 42 // button opens a drop down menu.
43 PermissionMenuButton(const base::string16& text, 43 PermissionMenuButton(const base::string16& text,
44 PermissionMenuModel* model, 44 PermissionMenuModel* model,
45 bool show_menu_marker); 45 bool show_menu_marker);
46 virtual ~PermissionMenuButton(); 46 virtual ~PermissionMenuButton();
47 47
48 // Overridden from views::LabelButton. 48 // Overridden from views::LabelButton.
49 virtual void SetText(const base::string16& text) OVERRIDE; 49 virtual void SetText(const base::string16& text) override;
50 50
51 // Overridden from views::View. 51 // Overridden from views::View.
52 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 52 virtual void GetAccessibleState(ui::AXViewState* state) override;
53 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; 53 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
54 54
55 private: 55 private:
56 // Overridden from views::MenuButtonListener. 56 // Overridden from views::MenuButtonListener.
57 virtual void OnMenuButtonClicked(View* source, 57 virtual void OnMenuButtonClicked(View* source,
58 const gfx::Point& point) OVERRIDE; 58 const gfx::Point& point) override;
59 59
60 PermissionMenuModel* menu_model_; // Owned by |PermissionSelectorView|. 60 PermissionMenuModel* menu_model_; // Owned by |PermissionSelectorView|.
61 scoped_ptr<views::MenuRunner> menu_runner_; 61 scoped_ptr<views::MenuRunner> menu_runner_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(PermissionMenuButton); 63 DISALLOW_COPY_AND_ASSIGN(PermissionMenuButton);
64 }; 64 };
65 65
66 /////////////////////////////////////////////////////////////////////////////// 66 ///////////////////////////////////////////////////////////////////////////////
67 // PermissionMenuButton 67 // PermissionMenuButton
68 /////////////////////////////////////////////////////////////////////////////// 68 ///////////////////////////////////////////////////////////////////////////////
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 // Update the menu button text to reflect the new setting. 213 // Update the menu button text to reflect the new setting.
214 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString( 214 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
215 permission.setting, 215 permission.setting,
216 permission.default_setting, 216 permission.default_setting,
217 content_settings::SETTING_SOURCE_USER)); 217 content_settings::SETTING_SOURCE_USER));
218 218
219 FOR_EACH_OBSERVER(PermissionSelectorViewObserver, 219 FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
220 observer_list_, 220 observer_list_,
221 OnPermissionChanged(permission)); 221 OnPermissionChanged(permission));
222 } 222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698