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

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 2126963002: mash: Move multi_profile_uma.* to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 5 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
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
74 #include "ash/multi_profile_uma.h"
75 #include "ash/shell.h"
76 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" 73 #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" 74 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
78 #include "chrome/browser/ui/browser_commands_chromeos.h" 75 #include "chrome/browser/ui/browser_commands_chromeos.h"
79 #endif 76 #endif
80 77
81 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 78 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
82 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" 79 #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
83 #endif 80 #endif
84 81
85 using content::NavigationEntry; 82 using content::NavigationEntry;
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 1267
1271 BrowserWindow* BrowserCommandController::window() { 1268 BrowserWindow* BrowserCommandController::window() {
1272 return browser_->window(); 1269 return browser_->window();
1273 } 1270 }
1274 1271
1275 Profile* BrowserCommandController::profile() { 1272 Profile* BrowserCommandController::profile() {
1276 return browser_->profile(); 1273 return browser_->profile();
1277 } 1274 }
1278 1275
1279 } // namespace chrome 1276 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698