| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 bool BrowserFrame::ShouldSaveWindowPlacement() const { | 160 bool BrowserFrame::ShouldSaveWindowPlacement() const { |
| 161 return native_browser_frame_->ShouldSaveWindowPlacement(); | 161 return native_browser_frame_->ShouldSaveWindowPlacement(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, | 164 void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, |
| 165 ui::WindowShowState* show_state) const { | 165 ui::WindowShowState* show_state) const { |
| 166 return native_browser_frame_->GetWindowPlacement(bounds, show_state); | 166 return native_browser_frame_->GetWindowPlacement(bounds, show_state); |
| 167 } | 167 } |
| 168 | 168 |
| 169 bool BrowserFrame::PreHandleKeyboardEvent( |
| 170 const content::NativeWebKeyboardEvent& event) { |
| 171 return native_browser_frame_->PreHandleKeyboardEvent(event); |
| 172 } |
| 173 |
| 174 bool BrowserFrame::HandleKeyboardEvent( |
| 175 const content::NativeWebKeyboardEvent& event) { |
| 176 return native_browser_frame_->HandleKeyboardEvent(event); |
| 177 } |
| 178 |
| 169 void BrowserFrame::OnBrowserViewInitViewsComplete() { | 179 void BrowserFrame::OnBrowserViewInitViewsComplete() { |
| 170 browser_frame_view_->OnBrowserViewInitViewsComplete(); | 180 browser_frame_view_->OnBrowserViewInitViewsComplete(); |
| 171 } | 181 } |
| 172 | 182 |
| 173 /////////////////////////////////////////////////////////////////////////////// | 183 /////////////////////////////////////////////////////////////////////////////// |
| 174 // BrowserFrame, views::Widget overrides: | 184 // BrowserFrame, views::Widget overrides: |
| 175 | 185 |
| 176 views::internal::RootView* BrowserFrame::CreateRootView() { | 186 views::internal::RootView* BrowserFrame::CreateRootView() { |
| 177 root_view_ = new BrowserRootView(browser_view_, this); | 187 root_view_ = new BrowserRootView(browser_view_, this); |
| 178 return root_view_; | 188 return root_view_; |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 } | 304 } |
| 295 | 305 |
| 296 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 306 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
| 297 return browser_frame_view_->GetProfileSwitcherView(); | 307 return browser_frame_view_->GetProfileSwitcherView(); |
| 298 } | 308 } |
| 299 | 309 |
| 300 void BrowserFrame::OnMenuClosed() { | 310 void BrowserFrame::OnMenuClosed() { |
| 301 menu_model_adapter_.reset(); | 311 menu_model_adapter_.reset(); |
| 302 menu_runner_.reset(); | 312 menu_runner_.reset(); |
| 303 } | 313 } |
| OLD | NEW |