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

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

Issue 10829038: (Views only) Resize the menu buttons on the Website Settings UI to fit the button text (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 8 years, 4 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 | Annotate | Revision Log
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_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 28 matching lines...) Expand all
39 // This method is called by the menu button model whenever the current setting 39 // This method is called by the menu button model whenever the current setting
40 // is changed. 40 // is changed.
41 void SelectionChanged(); 41 void SelectionChanged();
42 42
43 // Returns the selected setting. 43 // Returns the selected setting.
44 ContentSetting GetSelectedSetting() const; 44 ContentSetting GetSelectedSetting() const;
45 45
46 // Returns the permission type. 46 // Returns the permission type.
47 ContentSettingsType GetPermissionType() const; 47 ContentSettingsType GetPermissionType() const;
48 48
49 protected:
50 // Overridden from views::Views.
msw 2012/07/30 15:48:42 nit: "views::View"
markusheintz_ 2012/07/30 16:32:06 Done.
51 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
52
49 private: 53 private:
50 virtual ~PermissionSelectorView(); 54 virtual ~PermissionSelectorView();
51 55
52 views::ImageView* icon_; // Owned by the views hierachy. 56 views::ImageView* icon_; // Owned by the views hierachy.
53 internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy. 57 internal::PermissionMenuButton* menu_button_; // Owned by the views hierachy.
54 scoped_ptr<internal::PermissionMenuModel> menu_button_model_; 58 scoped_ptr<internal::PermissionMenuModel> menu_button_model_;
55 59
56 ObserverList<PermissionSelectorViewObserver, false> observer_list_; 60 ObserverList<PermissionSelectorViewObserver, false> observer_list_;
57 61
58 DISALLOW_COPY_AND_ASSIGN(PermissionSelectorView); 62 DISALLOW_COPY_AND_ASSIGN(PermissionSelectorView);
59 }; 63 };
60 64
61 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_PERMISSION_SELECTOR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698