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

Side by Side Diff: views/controls/link.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « views/controls/combobox/combobox.cc ('k') | views/controls/menu/menu_controller.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "views/controls/link.h" 5 #include "views/controls/link.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gdk/gdk.h> 8 #include <gdk/gdk.h>
9 #endif 9 #endif
10 10
11 #include "app/keyboard_codes.h"
12 #include "base/logging.h" 11 #include "base/logging.h"
13 #include "gfx/color_utils.h" 12 #include "gfx/color_utils.h"
14 #include "gfx/font.h" 13 #include "gfx/font.h"
14 #include "ui/base/keycodes/keyboard_codes.h"
15 #include "views/event.h" 15 #include "views/event.h"
16 16
17 #if defined(OS_LINUX) 17 #if defined(OS_LINUX)
18 #include "gfx/gtk_util.h" 18 #include "gfx/gtk_util.h"
19 #endif 19 #endif
20 20
21 namespace { 21 namespace {
22 22
23 void GetColors(const SkColor* background_color, // NULL means "use default" 23 void GetColors(const SkColor* background_color, // NULL means "use default"
24 SkColor* highlighted_color, 24 SkColor* highlighted_color,
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 HitTest(e.location())) { 119 HitTest(e.location())) {
120 // Focus the link on click. 120 // Focus the link on click.
121 RequestFocus(); 121 RequestFocus();
122 122
123 if (controller_) 123 if (controller_)
124 controller_->LinkActivated(this, e.GetFlags()); 124 controller_->LinkActivated(this, e.GetFlags());
125 } 125 }
126 } 126 }
127 127
128 bool Link::OnKeyPressed(const KeyEvent& e) { 128 bool Link::OnKeyPressed(const KeyEvent& e) {
129 bool activate = ((e.GetKeyCode() == app::VKEY_SPACE) || 129 bool activate = ((e.GetKeyCode() == ui::VKEY_SPACE) ||
130 (e.GetKeyCode() == app::VKEY_RETURN)); 130 (e.GetKeyCode() == ui::VKEY_RETURN));
131 if (!activate) 131 if (!activate)
132 return false; 132 return false;
133 133
134 SetHighlighted(false); 134 SetHighlighted(false);
135 135
136 // Focus the link on key pressed. 136 // Focus the link on key pressed.
137 RequestFocus(); 137 RequestFocus();
138 138
139 if (controller_) 139 if (controller_)
140 controller_->LinkActivated(this, e.GetFlags()); 140 controller_->LinkActivated(this, e.GetFlags());
141 141
142 return true; 142 return true;
143 } 143 }
144 144
145 bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) { 145 bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
146 // Make sure we don't process space or enter as accelerators. 146 // Make sure we don't process space or enter as accelerators.
147 return (e.GetKeyCode() == app::VKEY_SPACE) || 147 return (e.GetKeyCode() == ui::VKEY_SPACE) ||
148 (e.GetKeyCode() == app::VKEY_RETURN); 148 (e.GetKeyCode() == ui::VKEY_RETURN);
149 } 149 }
150 150
151 AccessibilityTypes::Role Link::GetAccessibleRole() { 151 AccessibilityTypes::Role Link::GetAccessibleRole() {
152 return AccessibilityTypes::ROLE_LINK; 152 return AccessibilityTypes::ROLE_LINK;
153 } 153 }
154 154
155 void Link::SetFont(const gfx::Font& font) { 155 void Link::SetFont(const gfx::Font& font) {
156 Label::SetFont(font); 156 Label::SetFont(font);
157 ValidateStyle(); 157 ValidateStyle();
158 } 158 }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } else { 220 } else {
221 if (font().GetStyle() & gfx::Font::UNDERLINED) { 221 if (font().GetStyle() & gfx::Font::UNDERLINED) {
222 Label::SetFont( 222 Label::SetFont(
223 font().DeriveFont(0, font().GetStyle() & ~gfx::Font::UNDERLINED)); 223 font().DeriveFont(0, font().GetStyle() & ~gfx::Font::UNDERLINED));
224 } 224 }
225 Label::SetColor(disabled_color_); 225 Label::SetColor(disabled_color_);
226 } 226 }
227 } 227 }
228 228
229 } // namespace views 229 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/combobox/combobox.cc ('k') | views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698