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

Side by Side Diff: ui/views/color_chooser/color_chooser_view.h

Issue 567463002: Color picker window should not have a minimize button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and Added unit test for minimize button visibility. Created 6 years, 3 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
« no previous file with comments | « no previous file | ui/views/color_chooser/color_chooser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_ 5 #ifndef UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_
6 #define UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_ 6 #define UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_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 "third_party/skia/include/core/SkColor.h" 10 #include "third_party/skia/include/core/SkColor.h"
(...skipping 30 matching lines...) Expand all
41 float saturation() const { return hsv_[1]; } 41 float saturation() const { return hsv_[1]; }
42 float value() const { return hsv_[2]; } 42 float value() const { return hsv_[2]; }
43 void set_listener(ColorChooserListener* listener) { listener_ = listener; } 43 void set_listener(ColorChooserListener* listener) { listener_ = listener; }
44 44
45 private: 45 private:
46 class HueView; 46 class HueView;
47 class SaturationValueView; 47 class SaturationValueView;
48 class SelectedColorPatchView; 48 class SelectedColorPatchView;
49 49
50 // WidgetDelegate overrides: 50 // WidgetDelegate overrides:
51 virtual bool CanMinimize() const OVERRIDE;
51 virtual View* GetInitiallyFocusedView() OVERRIDE; 52 virtual View* GetInitiallyFocusedView() OVERRIDE;
52 virtual ui::ModalType GetModalType() const OVERRIDE; 53 virtual ui::ModalType GetModalType() const OVERRIDE;
53 virtual void WindowClosing() OVERRIDE; 54 virtual void WindowClosing() OVERRIDE;
54 virtual View* GetContentsView() OVERRIDE; 55 virtual View* GetContentsView() OVERRIDE;
55 56
56 // TextfieldController overrides: 57 // TextfieldController overrides:
57 virtual void ContentsChanged(Textfield* sender, 58 virtual void ContentsChanged(Textfield* sender,
58 const base::string16& new_contents) OVERRIDE; 59 const base::string16& new_contents) OVERRIDE;
59 virtual bool HandleKeyEvent(Textfield* sender, 60 virtual bool HandleKeyEvent(Textfield* sender,
60 const ui::KeyEvent& key_event) OVERRIDE; 61 const ui::KeyEvent& key_event) OVERRIDE;
(...skipping 18 matching lines...) Expand all
79 80
80 // The rectangle to denote the selected color. 81 // The rectangle to denote the selected color.
81 SelectedColorPatchView* selected_color_patch_; 82 SelectedColorPatchView* selected_color_patch_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(ColorChooserView); 84 DISALLOW_COPY_AND_ASSIGN(ColorChooserView);
84 }; 85 };
85 86
86 } // namespace views 87 } // namespace views
87 88
88 #endif // UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_ 89 #endif // UI_VIEWS_COLOR_CHOOSER_COLOR_CHOOSER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/color_chooser/color_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698