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 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/ui/views/frame/top_container_view.h" | 26 #include "chrome/browser/ui/views/frame/top_container_view.h" |
27 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
28 #include "ui/base/hit_test.h" | 28 #include "ui/base/hit_test.h" |
29 #include "ui/events/event_handler.h" | 29 #include "ui/events/event_handler.h" |
30 #include "ui/gfx/font_list.h" | 30 #include "ui/gfx/font_list.h" |
31 #include "ui/views/controls/menu/menu_model_adapter.h" | 31 #include "ui/views/controls/menu/menu_model_adapter.h" |
32 #include "ui/views/controls/menu/menu_runner.h" | 32 #include "ui/views/controls/menu/menu_runner.h" |
33 #include "ui/views/widget/native_widget.h" | 33 #include "ui/views/widget/native_widget.h" |
34 | 34 |
35 #if defined(OS_CHROMEOS) | 35 #if defined(OS_CHROMEOS) |
36 #include "ash/common/session/session_state_delegate.h" | 36 #include "ash/common/session/session_state_delegate.h" // nogncheck |
37 #include "ash/common/wm_shell.h" | 37 #include "ash/common/wm_shell.h" // nogncheck |
38 #include "ui/native_theme/native_theme_dark_aura.h" | 38 #include "ui/native_theme/native_theme_dark_aura.h" // nogncheck |
39 #endif | 39 #endif |
40 | 40 |
41 #if defined(OS_LINUX) | 41 #if defined(OS_LINUX) |
42 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" | 42 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" |
43 #endif | 43 #endif |
44 | 44 |
45 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 45 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
46 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" | 46 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" |
47 #endif | 47 #endif |
48 | 48 |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 } | 294 } |
295 | 295 |
296 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 296 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
297 return browser_frame_view_->GetProfileSwitcherView(); | 297 return browser_frame_view_->GetProfileSwitcherView(); |
298 } | 298 } |
299 | 299 |
300 void BrowserFrame::OnMenuClosed() { | 300 void BrowserFrame::OnMenuClosed() { |
301 menu_model_adapter_.reset(); | 301 menu_model_adapter_.reset(); |
302 menu_runner_.reset(); | 302 menu_runner_.reset(); |
303 } | 303 } |
OLD | NEW |