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

Side by Side Diff: chrome/browser/ui/views/location_bar/star_view.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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
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 #include "chrome/browser/ui/views/location_bar/star_view.h" 5 #include "chrome/browser/ui/views/location_bar/star_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/command_updater.h" 9 #include "chrome/browser/command_updater.h"
10 #include "chrome/browser/ui/view_ids.h" 10 #include "chrome/browser/ui/view_ids.h"
11 #include "chrome/browser/ui/views/browser_dialogs.h" 11 #include "chrome/browser/ui/views/browser_dialogs.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
14 #include "grit/theme_resources_standard.h"
15 #include "ui/base/accessibility/accessible_view_state.h" 14 #include "ui/base/accessibility/accessible_view_state.h"
16 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
18 17
19 StarView::StarView(CommandUpdater* command_updater) 18 StarView::StarView(CommandUpdater* command_updater)
20 : command_updater_(command_updater) { 19 : command_updater_(command_updater) {
21 set_id(VIEW_ID_STAR_BUTTON); 20 set_id(VIEW_ID_STAR_BUTTON);
22 SetToggled(false); 21 SetToggled(false);
23 set_accessibility_focusable(true); 22 set_accessibility_focusable(true);
24 TouchableLocationBarView::Init(this); 23 TouchableLocationBarView::Init(this);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } 70 }
72 71
73 bool StarView::OnKeyPressed(const views::KeyEvent& event) { 72 bool StarView::OnKeyPressed(const views::KeyEvent& event) {
74 if (event.key_code() == ui::VKEY_SPACE || 73 if (event.key_code() == ui::VKEY_SPACE ||
75 event.key_code() == ui::VKEY_RETURN) { 74 event.key_code() == ui::VKEY_RETURN) {
76 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE); 75 command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
77 return true; 76 return true;
78 } 77 }
79 return false; 78 return false;
80 } 79 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698