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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/leak_annotations.h" 10 #include "base/debug/leak_annotations.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h" 25 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
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_runner.h" 31 #include "ui/views/controls/menu/menu_runner.h"
32 #include "ui/views/widget/native_widget.h" 32 #include "ui/views/widget/native_widget.h"
33 33
34 #if defined(OS_CHROMEOS) 34 #if defined(OS_CHROMEOS)
35 #include "ash/session/session_state_delegate.h" 35 #include "ash/common/session/session_state_delegate.h"
36 #include "ash/shell.h" 36 #include "ash/shell.h"
37 #include "ui/native_theme/native_theme_dark_aura.h" 37 #include "ui/native_theme/native_theme_dark_aura.h"
38 #endif 38 #endif
39 39
40 #if defined(OS_LINUX) 40 #if defined(OS_LINUX)
41 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" 41 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
42 #endif 42 #endif
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "ui/native_theme/native_theme_dark_win.h" 45 #include "ui/native_theme/native_theme_dark_win.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 menu_model_builder_.reset( 268 menu_model_builder_.reset(
269 new SystemMenuModelBuilder(browser_view_, browser_view_->browser())); 269 new SystemMenuModelBuilder(browser_view_, browser_view_->browser()));
270 menu_model_builder_->Init(); 270 menu_model_builder_->Init();
271 } 271 }
272 return menu_model_builder_->menu_model(); 272 return menu_model_builder_->menu_model();
273 } 273 }
274 274
275 views::View* BrowserFrame::GetNewAvatarMenuButton() { 275 views::View* BrowserFrame::GetNewAvatarMenuButton() {
276 return browser_frame_view_->GetProfileSwitcherView(); 276 return browser_frame_view_->GetProfileSwitcherView();
277 } 277 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698