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

Side by Side Diff: chrome/browser/views/location_bar/page_action_image_view.cc

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge Created 10 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
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 "chrome/browser/views/location_bar/page_action_image_view.h" 5 #include "chrome/browser/views/location_bar/page_action_image_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browser_list.h" 8 #include "chrome/browser/browser_list.h"
9 #include "chrome/browser/extensions/extension_browser_event_router.h" 9 #include "chrome/browser/extensions/extension_browser_event_router.h"
10 #include "chrome/browser/extensions/extensions_service.h" 10 #include "chrome/browser/extensions/extensions_service.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // Make the menu appear below the button. 130 // Make the menu appear below the button.
131 menu_origin.Offset(0, height()); 131 menu_origin.Offset(0, height());
132 ShowContextMenu(menu_origin, true); 132 ShowContextMenu(menu_origin, true);
133 return; 133 return;
134 } 134 }
135 135
136 ExecuteAction(button, false); // inspect_with_devtools 136 ExecuteAction(button, false); // inspect_with_devtools
137 } 137 }
138 138
139 bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) { 139 bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) {
140 if (e.GetKeyCode() == base::VKEY_SPACE || 140 if (e.GetKeyCode() == app::VKEY_SPACE ||
141 e.GetKeyCode() == base::VKEY_RETURN) { 141 e.GetKeyCode() == app::VKEY_RETURN) {
142 ExecuteAction(1, false); 142 ExecuteAction(1, false);
143 return true; 143 return true;
144 } 144 }
145 return false; 145 return false;
146 } 146 }
147 147
148 void PageActionImageView::ShowContextMenu(const gfx::Point& p, 148 void PageActionImageView::ShowContextMenu(const gfx::Point& p,
149 bool is_mouse_gesture) { 149 bool is_mouse_gesture) {
150 Extension* extension = profile_->GetExtensionsService()->GetExtensionById( 150 Extension* extension = profile_->GetExtensionsService()->GetExtensionById(
151 page_action()->extension_id(), false); 151 page_action()->extension_id(), false);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) { 232 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {
233 DCHECK_EQ(popup_, popup); 233 DCHECK_EQ(popup_, popup);
234 // ExtensionPopup is ref-counted, so we don't need to delete it. 234 // ExtensionPopup is ref-counted, so we don't need to delete it.
235 popup_ = NULL; 235 popup_ = NULL;
236 } 236 }
237 237
238 void PageActionImageView::HidePopup() { 238 void PageActionImageView::HidePopup() {
239 if (popup_) 239 if (popup_)
240 popup_->Close(); 240 popup_->Close();
241 } 241 }
OLDNEW
« no previous file with comments | « chrome/browser/views/location_bar/location_bar_view.cc ('k') | chrome/browser/views/location_bar/star_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698