OLD | NEW |
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/frame/browser_frame.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/leak_annotations.h" | 10 #include "base/debug/leak_annotations.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 | 143 |
144 bool BrowserFrame::ShouldSaveWindowPlacement() const { | 144 bool BrowserFrame::ShouldSaveWindowPlacement() const { |
145 return native_browser_frame_->ShouldSaveWindowPlacement(); | 145 return native_browser_frame_->ShouldSaveWindowPlacement(); |
146 } | 146 } |
147 | 147 |
148 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, | 148 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, |
149 ui::WindowShowState* show_state) const { | 149 ui::WindowShowState* show_state) const { |
150 return native_browser_frame_->GetWindowPlacement(bounds, show_state); | 150 return native_browser_frame_->GetWindowPlacement(bounds, show_state); |
151 } | 151 } |
152 | 152 |
| 153 bool BrowserFrame::PreHandleKeyboardEvent( |
| 154 const content::NativeWebKeyboardEvent& event) { |
| 155 return native_browser_frame_->PreHandleKeyboardEvent(event); |
| 156 } |
| 157 |
| 158 bool BrowserFrame::HandleKeyboardEvent( |
| 159 const content::NativeWebKeyboardEvent& event) { |
| 160 return native_browser_frame_->HandleKeyboardEvent(event); |
| 161 } |
| 162 |
153 void BrowserFrame::OnBrowserViewInitViewsComplete() { | 163 void BrowserFrame::OnBrowserViewInitViewsComplete() { |
154 browser_frame_view_->OnBrowserViewInitViewsComplete(); | 164 browser_frame_view_->OnBrowserViewInitViewsComplete(); |
155 } | 165 } |
156 | 166 |
157 /////////////////////////////////////////////////////////////////////////////// | 167 /////////////////////////////////////////////////////////////////////////////// |
158 // BrowserFrame, views::Widget overrides: | 168 // BrowserFrame, views::Widget overrides: |
159 | 169 |
160 views::internal::RootView* BrowserFrame::CreateRootView() { | 170 views::internal::RootView* BrowserFrame::CreateRootView() { |
161 root_view_ = new BrowserRootView(browser_view_, this); | 171 root_view_ = new BrowserRootView(browser_view_, this); |
162 return root_view_; | 172 return root_view_; |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 return menu_model_builder_->menu_model(); | 283 return menu_model_builder_->menu_model(); |
274 } | 284 } |
275 | 285 |
276 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 286 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
277 return browser_frame_view_->GetProfileSwitcherView(); | 287 return browser_frame_view_->GetProfileSwitcherView(); |
278 } | 288 } |
279 | 289 |
280 void BrowserFrame::OnMenuClosed() { | 290 void BrowserFrame::OnMenuClosed() { |
281 menu_runner_.reset(); | 291 menu_runner_.reset(); |
282 } | 292 } |
OLD | NEW |