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

Side by Side Diff: ui/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: Rebase 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
« no previous file with comments | « ui/ui.gyp ('k') | ui/views/window/dialog_client_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) 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 UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ 5 #ifndef UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
6 #define UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ 6 #define UI_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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 View* focused_now) OVERRIDE; 82 View* focused_now) OVERRIDE;
83 83
84 protected: 84 protected:
85 // View overrides: 85 // View overrides:
86 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 86 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
87 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE; 87 virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
88 virtual void Layout() OVERRIDE; 88 virtual void Layout() OVERRIDE;
89 virtual void ViewHierarchyChanged(bool is_add, View* parent, 89 virtual void ViewHierarchyChanged(bool is_add, View* parent,
90 View* child) OVERRIDE; 90 View* child) OVERRIDE;
91 virtual gfx::Size GetPreferredSize() OVERRIDE; 91 virtual gfx::Size GetPreferredSize() OVERRIDE;
92 virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; 92 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
93 93
94 // ButtonListener implementation: 94 // ButtonListener implementation:
95 virtual void ButtonPressed(Button* sender, 95 virtual void ButtonPressed(Button* sender,
96 const views::Event& event) OVERRIDE; 96 const views::Event& event) OVERRIDE;
97 97
98 private: 98 private:
99 // Paint the size box in the bottom right corner of the window if it is 99 // Paint the size box in the bottom right corner of the window if it is
100 // resizable. 100 // resizable.
101 void PaintSizeBox(gfx::Canvas* canvas); 101 void PaintSizeBox(gfx::Canvas* canvas);
102 102
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 // Static resource initialization 162 // Static resource initialization
163 static gfx::Font* dialog_button_font_; 163 static gfx::Font* dialog_button_font_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(DialogClientView); 165 DISALLOW_COPY_AND_ASSIGN(DialogClientView);
166 }; 166 };
167 167
168 } // namespace views 168 } // namespace views
169 169
170 #endif // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_ 170 #endif // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | ui/views/window/dialog_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698