| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/panels/panel_browser_frame_view.h" | 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 HandleGlobalMouseMoveEvent(); | 210 HandleGlobalMouseMoveEvent(); |
| 211 break; | 211 break; |
| 212 default: | 212 default: |
| 213 break; | 213 break; |
| 214 } | 214 } |
| 215 } | 215 } |
| 216 #elif defined(USE_AURA) | 216 #elif defined(USE_AURA) |
| 217 base::MessagePumpObserver::EventStatus | 217 base::MessagePumpObserver::EventStatus |
| 218 PanelBrowserFrameView::MouseWatcher::WillProcessXEvent( | 218 PanelBrowserFrameView::MouseWatcher::WillProcessXEvent( |
| 219 XEvent* xevent) { | 219 XEvent* xevent) { |
| 220 // TODO(saintlou): This is dummy code, but a value must be returned. | |
| 221 NOTIMPLEMENTED(); | 220 NOTIMPLEMENTED(); |
| 222 return EVENT_CONTINUE; | 221 return EVENT_CONTINUE; |
| 223 } | 222 } |
| 224 #endif | 223 #endif |
| 225 | 224 |
| 226 void PanelBrowserFrameView::MouseWatcher::HandleGlobalMouseMoveEvent() { | 225 void PanelBrowserFrameView::MouseWatcher::HandleGlobalMouseMoveEvent() { |
| 227 bool is_mouse_within = IsCursorInViewBounds(); | 226 bool is_mouse_within = IsCursorInViewBounds(); |
| 228 if (is_mouse_within == is_mouse_within_) | 227 if (is_mouse_within == is_mouse_within_) |
| 229 return; | 228 return; |
| 230 is_mouse_within_ = is_mouse_within; | 229 is_mouse_within_ = is_mouse_within; |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 | 746 |
| 748 settings_menu_model_.reset( | 747 settings_menu_model_.reset( |
| 749 new PanelSettingsMenuModel(browser_view_->panel())); | 748 new PanelSettingsMenuModel(browser_view_->panel())); |
| 750 settings_menu_adapter_.reset( | 749 settings_menu_adapter_.reset( |
| 751 new views::MenuModelAdapter(settings_menu_model_.get())); | 750 new views::MenuModelAdapter(settings_menu_model_.get())); |
| 752 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); | 751 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); |
| 753 settings_menu_adapter_->BuildMenu(settings_menu_); | 752 settings_menu_adapter_->BuildMenu(settings_menu_); |
| 754 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); | 753 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); |
| 755 return true; | 754 return true; |
| 756 } | 755 } |
| OLD | NEW |