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

Side by Side Diff: chrome/browser/ui/views/website_settings/permission_selector_row.h

Issue 2726853007: Views/Permissions: Update desktop UI to display BLOCK for embargoed permissions. (Closed)
Patch Set: Created 3 years, 9 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 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 protected: 48 protected:
49 // Overridden from views::View. 49 // Overridden from views::View.
50 void ChildPreferredSizeChanged(View* child) override; 50 void ChildPreferredSizeChanged(View* child) override;
51 51
52 private: 52 private:
53 ~PermissionSelectorRow() override; 53 ~PermissionSelectorRow() override;
54 54
55 void InitializeMenuButtonView( 55 void InitializeMenuButtonView(
56 views::GridLayout* layout, 56 views::GridLayout* layout,
57 const WebsiteSettingsUI::PermissionInfo& permission); 57 const WebsiteSettingsUI::PermissionInfo& permission,
58 const bool button_enabled);
58 void InitializeComboboxView( 59 void InitializeComboboxView(
59 views::GridLayout* layout, 60 views::GridLayout* layout,
60 const WebsiteSettingsUI::PermissionInfo& permission); 61 const WebsiteSettingsUI::PermissionInfo& permission,
62 const bool button_enabled);
61 63
62 Profile* profile_; 64 Profile* profile_;
63 65
64 // Model for the permission's menu. 66 // Model for the permission's menu.
65 std::unique_ptr<PermissionMenuModel> menu_model_; 67 std::unique_ptr<PermissionMenuModel> menu_model_;
66 std::unique_ptr<internal::ComboboxModelAdapter> combobox_model_adapter_; 68 std::unique_ptr<internal::ComboboxModelAdapter> combobox_model_adapter_;
67 69
68 views::ImageView* icon_; // Owned by the views hierachy. 70 views::ImageView* icon_; // Owned by the views hierachy.
69 internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy. 71 internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy.
70 internal::PermissionCombobox* combobox_; // Owned by the views hierarchy. 72 internal::PermissionCombobox* combobox_; // Owned by the views hierarchy.
71 73
72 base::ObserverList<PermissionSelectorRowObserver, false> observer_list_; 74 base::ObserverList<PermissionSelectorRowObserver, false> observer_list_;
73 75
74 DISALLOW_COPY_AND_ASSIGN(PermissionSelectorRow); 76 DISALLOW_COPY_AND_ASSIGN(PermissionSelectorRow);
75 }; 77 };
76 78
77 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_ 79 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_ROW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698