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/browser_command_controller.h" | 5 #include "chrome/browser/ui/browser_command_controller.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "content/public/browser/gpu_data_manager.h" | 54 #include "content/public/browser/gpu_data_manager.h" |
55 #endif | 55 #endif |
56 | 56 |
57 #if defined(USE_ASH) | 57 #if defined(USE_ASH) |
58 #include "ash/accelerators/accelerator_commands.h" | 58 #include "ash/accelerators/accelerator_commands.h" |
59 #include "chrome/browser/ui/ash/ash_util.h" | 59 #include "chrome/browser/ui/ash/ash_util.h" |
60 #endif | 60 #endif |
61 | 61 |
62 #if defined(OS_CHROMEOS) | 62 #if defined(OS_CHROMEOS) |
63 #include "ash/multi_profile_uma.h" | 63 #include "ash/multi_profile_uma.h" |
64 #include "ash/session_state_delegate.h" | 64 #include "ash/session/session_state_delegate.h" |
65 #include "ash/shell.h" | 65 #include "ash/shell.h" |
66 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" | 66 #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" |
67 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 67 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
68 #include "chrome/browser/ui/browser_commands_chromeos.h" | 68 #include "chrome/browser/ui/browser_commands_chromeos.h" |
69 #endif | 69 #endif |
70 | 70 |
71 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 71 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
72 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" | 72 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" |
73 #endif | 73 #endif |
74 | 74 |
(...skipping 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1361 | 1361 |
1362 BrowserWindow* BrowserCommandController::window() { | 1362 BrowserWindow* BrowserCommandController::window() { |
1363 return browser_->window(); | 1363 return browser_->window(); |
1364 } | 1364 } |
1365 | 1365 |
1366 Profile* BrowserCommandController::profile() { | 1366 Profile* BrowserCommandController::profile() { |
1367 return browser_->profile(); | 1367 return browser_->profile(); |
1368 } | 1368 } |
1369 | 1369 |
1370 } // namespace chrome | 1370 } // namespace chrome |
OLD | NEW |