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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 | 147 |
148 bool BrowserFrame::ShouldSaveWindowPlacement() const { | 148 bool BrowserFrame::ShouldSaveWindowPlacement() const { |
149 return native_browser_frame_->ShouldSaveWindowPlacement(); | 149 return native_browser_frame_->ShouldSaveWindowPlacement(); |
150 } | 150 } |
151 | 151 |
152 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, | 152 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, |
153 ui::WindowShowState* show_state) const { | 153 ui::WindowShowState* show_state) const { |
154 return native_browser_frame_->GetWindowPlacement(bounds, show_state); | 154 return native_browser_frame_->GetWindowPlacement(bounds, show_state); |
155 } | 155 } |
156 | 156 |
| 157 bool BrowserFrame::PreHandleKeyboardEvent( |
| 158 const content::NativeWebKeyboardEvent& event) { |
| 159 return native_browser_frame_->PreHandleKeyboardEvent(event); |
| 160 } |
| 161 |
| 162 bool BrowserFrame::HandleKeyboardEvent( |
| 163 const content::NativeWebKeyboardEvent& event) { |
| 164 return native_browser_frame_->HandleKeyboardEvent(event); |
| 165 } |
| 166 |
157 void BrowserFrame::OnBrowserViewInitViewsComplete() { | 167 void BrowserFrame::OnBrowserViewInitViewsComplete() { |
158 browser_frame_view_->OnBrowserViewInitViewsComplete(); | 168 browser_frame_view_->OnBrowserViewInitViewsComplete(); |
159 } | 169 } |
160 | 170 |
161 /////////////////////////////////////////////////////////////////////////////// | 171 /////////////////////////////////////////////////////////////////////////////// |
162 // BrowserFrame, views::Widget overrides: | 172 // BrowserFrame, views::Widget overrides: |
163 | 173 |
164 views::internal::RootView* BrowserFrame::CreateRootView() { | 174 views::internal::RootView* BrowserFrame::CreateRootView() { |
165 root_view_ = new BrowserRootView(browser_view_, this); | 175 root_view_ = new BrowserRootView(browser_view_, this); |
166 return root_view_; | 176 return root_view_; |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 return menu_model_builder_->menu_model(); | 289 return menu_model_builder_->menu_model(); |
280 } | 290 } |
281 | 291 |
282 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 292 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
283 return browser_frame_view_->GetProfileSwitcherView(); | 293 return browser_frame_view_->GetProfileSwitcherView(); |
284 } | 294 } |
285 | 295 |
286 void BrowserFrame::OnMenuClosed() { | 296 void BrowserFrame::OnMenuClosed() { |
287 menu_runner_.reset(); | 297 menu_runner_.reset(); |
288 } | 298 } |
OLD | NEW |