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

Side by Side Diff: chrome/browser/external_tab_container_win.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/external_tab_container_win.h" 5 #include "chrome/browser/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 911
912 focus_manager_ = GetFocusManager(); 912 focus_manager_ = GetFocusManager();
913 DCHECK(focus_manager_); 913 DCHECK(focus_manager_);
914 914
915 // Let's fill our own accelerator table. 915 // Let's fill our own accelerator table.
916 for (int i = 0; i < count; ++i) { 916 for (int i = 0; i < count; ++i) {
917 bool alt_down = (accelerators[i].fVirt & FALT) == FALT; 917 bool alt_down = (accelerators[i].fVirt & FALT) == FALT;
918 bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL; 918 bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL;
919 bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT; 919 bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT;
920 views::Accelerator accelerator( 920 views::Accelerator accelerator(
921 static_cast<base::KeyboardCode>(accelerators[i].key), 921 static_cast<app::KeyboardCode>(accelerators[i].key),
922 shift_down, ctrl_down, alt_down); 922 shift_down, ctrl_down, alt_down);
923 accelerator_table_[accelerator] = accelerators[i].cmd; 923 accelerator_table_[accelerator] = accelerators[i].cmd;
924 924
925 // Also register with the focus manager. 925 // Also register with the focus manager.
926 if (focus_manager_) 926 if (focus_manager_)
927 focus_manager_->RegisterAccelerator(accelerator, this); 927 focus_manager_->RegisterAccelerator(accelerator, this);
928 } 928 }
929 } 929 }
930 930
931 void ExternalTabContainer::OnReinitialize() { 931 void ExternalTabContainer::OnReinitialize() {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 external_tab_view_->SetLayoutManager(layout); 982 external_tab_view_->SetLayoutManager(layout);
983 983
984 layout->StartRow(0, 0); 984 layout->StartRow(0, 0);
985 layout->AddView(info_bar_container); 985 layout->AddView(info_bar_container);
986 layout->StartRow(1, 0); 986 layout->StartRow(1, 0);
987 layout->AddView(tab_contents_container_); 987 layout->AddView(tab_contents_container_);
988 SetContentsView(external_tab_view_); 988 SetContentsView(external_tab_view_);
989 // Note that SetTabContents must be called after AddChildView is called 989 // Note that SetTabContents must be called after AddChildView is called
990 tab_contents_container_->ChangeTabContents(tab_contents_); 990 tab_contents_container_->ChangeTabContents(tab_contents_);
991 } 991 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_input_api.cc ('k') | chrome/browser/find_bar_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698