Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/debug/leak_annotations.h" 9 #include "base/debug/leak_annotations.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/app_mode/app_mode_utils.h" 12 #include "chrome/browser/app_mode/app_mode_utils.h"
13 #include "chrome/browser/themes/theme_service.h" 13 #include "chrome/browser/themes/theme_service.h"
14 #include "chrome/browser/themes/theme_service_factory.h" 14 #include "chrome/browser/themes/theme_service_factory.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
17 #include "chrome/browser/ui/browser_window_state.h" 17 #include "chrome/browser/ui/browser_window_state.h"
18 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 18 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
19 #include "chrome/browser/ui/views/frame/browser_root_view.h" 19 #include "chrome/browser/ui/views/frame/browser_root_view.h"
20 #include "chrome/browser/ui/views/frame/browser_view.h" 20 #include "chrome/browser/ui/views/frame/browser_view.h"
21 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 21 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
22 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 22 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
23 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" 23 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
24 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h" 24 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
25 #include "chrome/browser/ui/views/frame/top_container_view.h" 25 #include "chrome/browser/ui/views/frame/top_container_view.h"
26 #include "ui/base/hit_test.h" 26 #include "ui/base/hit_test.h"
27 #include "ui/events/event_handler.h" 27 #include "ui/events/event_handler.h"
28 #include "ui/gfx/font_list.h" 28 #include "ui/gfx/font_list.h"
29 #include "ui/gfx/screen.h"
30 #include "ui/views/controls/menu/menu_runner.h" 29 #include "ui/views/controls/menu/menu_runner.h"
31 #include "ui/views/widget/native_widget.h" 30 #include "ui/views/widget/native_widget.h"
32 31
33 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
34 #include "ash/session/session_state_delegate.h" 33 #include "ash/session/session_state_delegate.h"
35 #include "ash/shell.h" 34 #include "ash/shell.h"
36 #include "ui/native_theme/native_theme_dark_aura.h" 35 #include "ui/native_theme/native_theme_dark_aura.h"
37 #endif 36 #endif
38 37
39 #if defined(OS_LINUX) 38 #if defined(OS_LINUX)
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 return menu_model_builder_->menu_model(); 256 return menu_model_builder_->menu_model();
258 } 257 }
259 258
260 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { 259 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
261 return browser_frame_view_->avatar_button(); 260 return browser_frame_view_->avatar_button();
262 } 261 }
263 262
264 views::View* BrowserFrame::GetNewAvatarMenuButton() { 263 views::View* BrowserFrame::GetNewAvatarMenuButton() {
265 return browser_frame_view_->GetProfileSwitcherView(); 264 return browser_frame_view_->GetProfileSwitcherView();
266 } 265 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_dialog.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698