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

Side by Side Diff: chrome/browser/ui/browser_command_controller.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/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "base/win/windows_version.h" 63 #include "base/win/windows_version.h"
64 #include "content/public/browser/gpu_data_manager.h" 64 #include "content/public/browser/gpu_data_manager.h"
65 #endif 65 #endif
66 66
67 #if defined(USE_ASH) 67 #if defined(USE_ASH)
68 #include "ash/accelerators/accelerator_commands.h" 68 #include "ash/accelerators/accelerator_commands.h"
69 #include "chrome/browser/ui/ash/ash_util.h" 69 #include "chrome/browser/ui/ash/ash_util.h"
70 #endif 70 #endif
71 71
72 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
73 #include "ash/common/session/session_state_delegate.h"
73 #include "ash/multi_profile_uma.h" 74 #include "ash/multi_profile_uma.h"
74 #include "ash/session/session_state_delegate.h"
75 #include "ash/shell.h" 75 #include "ash/shell.h"
76 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" 76 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
77 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 77 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
78 #include "chrome/browser/ui/browser_commands_chromeos.h" 78 #include "chrome/browser/ui/browser_commands_chromeos.h"
79 #endif 79 #endif
80 80
81 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 81 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
82 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" 82 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
83 #endif 83 #endif
84 84
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 1272
1273 BrowserWindow* BrowserCommandController::window() { 1273 BrowserWindow* BrowserCommandController::window() {
1274 return browser_->window(); 1274 return browser_->window();
1275 } 1275 }
1276 1276
1277 Profile* BrowserCommandController::profile() { 1277 Profile* BrowserCommandController::profile() {
1278 return browser_->profile(); 1278 return browser_->profile();
1279 } 1279 }
1280 1280
1281 } // namespace chrome 1281 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698