| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 #if defined(OS_CHROMEOS) | 72 #if defined(OS_CHROMEOS) |
| 73 #include "ash/common/session/session_state_delegate.h" | 73 #include "ash/common/session/session_state_delegate.h" |
| 74 #include "ash/multi_profile_uma.h" | 74 #include "ash/multi_profile_uma.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/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" |
| 83 #endif | 83 #endif |
| 84 | 84 |
| 85 using content::NavigationEntry; | 85 using content::NavigationEntry; |
| 86 using content::NavigationController; | 86 using content::NavigationController; |
| 87 using content::WebContents; | 87 using content::WebContents; |
| 88 | 88 |
| 89 namespace { | 89 namespace { |
| 90 | 90 |
| 91 enum WindowState { | 91 enum WindowState { |
| 92 // Not in fullscreen mode. | 92 // Not in fullscreen mode. |
| (...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1274 | 1274 |
| 1275 BrowserWindow* BrowserCommandController::window() { | 1275 BrowserWindow* BrowserCommandController::window() { |
| 1276 return browser_->window(); | 1276 return browser_->window(); |
| 1277 } | 1277 } |
| 1278 | 1278 |
| 1279 Profile* BrowserCommandController::profile() { | 1279 Profile* BrowserCommandController::profile() { |
| 1280 return browser_->profile(); | 1280 return browser_->profile(); |
| 1281 } | 1281 } |
| 1282 | 1282 |
| 1283 } // namespace chrome | 1283 } // namespace chrome |
| OLD | NEW |