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

Side by Side Diff: views/window/dialog_client_view.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ 5 #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
6 #define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ 6 #define VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/gfx/font.h" 9 #include "ui/gfx/font.h"
10 #include "views/focus/focus_manager.h" 10 #include "views/focus/focus_manager.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 View* focused_now) OVERRIDE; 80 View* focused_now) OVERRIDE;
81 81
82 protected: 82 protected:
83 // View overrides: 83 // View overrides:
84 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 84 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
85 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; 85 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
86 virtual void Layout() OVERRIDE; 86 virtual void Layout() OVERRIDE;
87 virtual void ViewHierarchyChanged(bool is_add, View* parent, 87 virtual void ViewHierarchyChanged(bool is_add, View* parent,
88 View* child) OVERRIDE; 88 View* child) OVERRIDE;
89 virtual gfx::Size GetPreferredSize() OVERRIDE; 89 virtual gfx::Size GetPreferredSize() OVERRIDE;
90 virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; 90 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
91 91
92 // ButtonListener implementation: 92 // ButtonListener implementation:
93 virtual void ButtonPressed(Button* sender, 93 virtual void ButtonPressed(Button* sender,
94 const views::Event& event) OVERRIDE; 94 const views::Event& event) OVERRIDE;
95 95
96 private: 96 private:
97 // Paint the size box in the bottom right corner of the window if it is 97 // Paint the size box in the bottom right corner of the window if it is
98 // resizable. 98 // resizable.
99 void PaintSizeBox(gfx::Canvas* canvas); 99 void PaintSizeBox(gfx::Canvas* canvas);
100 100
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Static resource initialization 160 // Static resource initialization
161 static gfx::Font* dialog_button_font_; 161 static gfx::Font* dialog_button_font_;
162 162
163 DISALLOW_COPY_AND_ASSIGN(DialogClientView); 163 DISALLOW_COPY_AND_ASSIGN(DialogClientView);
164 }; 164 };
165 165
166 } // namespace views 166 } // namespace views
167 167
168 #endif // #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ 168 #endif // #ifndef VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698