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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "content/public/browser/native_web_keyboard_event.h" 50 #include "content/public/browser/native_web_keyboard_event.h"
51 #include "content/public/browser/navigation_controller.h" 51 #include "content/public/browser/navigation_controller.h"
52 #include "content/public/browser/navigation_entry.h" 52 #include "content/public/browser/navigation_entry.h"
53 #include "content/public/browser/user_metrics.h" 53 #include "content/public/browser/user_metrics.h"
54 #include "content/public/browser/web_contents.h" 54 #include "content/public/browser/web_contents.h"
55 #include "content/public/browser/web_contents_observer.h" 55 #include "content/public/browser/web_contents_observer.h"
56 #include "content/public/common/service_manager_connection.h" 56 #include "content/public/common/service_manager_connection.h"
57 #include "content/public/common/url_constants.h" 57 #include "content/public/common/url_constants.h"
58 #include "extensions/browser/extension_system.h" 58 #include "extensions/browser/extension_system.h"
59 #include "mash/public/interfaces/launchable.mojom.h" 59 #include "mash/public/interfaces/launchable.mojom.h"
60 #include "services/shell/public/cpp/connector.h" 60 #include "services/service_manager/public/cpp/connector.h"
61 #include "ui/events/keycodes/keyboard_codes.h" 61 #include "ui/events/keycodes/keyboard_codes.h"
62 62
63 #if defined(OS_MACOSX) 63 #if defined(OS_MACOSX)
64 #include "chrome/browser/ui/browser_commands_mac.h" 64 #include "chrome/browser/ui/browser_commands_mac.h"
65 #endif 65 #endif
66 66
67 #if defined(OS_WIN) 67 #if defined(OS_WIN)
68 #include "base/win/windows_version.h" 68 #include "base/win/windows_version.h"
69 #include "content/public/browser/gpu_data_manager.h" 69 #include "content/public/browser/gpu_data_manager.h"
70 #endif 70 #endif
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 1173
1174 BrowserWindow* BrowserCommandController::window() { 1174 BrowserWindow* BrowserCommandController::window() {
1175 return browser_->window(); 1175 return browser_->window();
1176 } 1176 }
1177 1177
1178 Profile* BrowserCommandController::profile() { 1178 Profile* BrowserCommandController::profile() {
1179 return browser_->profile(); 1179 return browser_->profile();
1180 } 1180 }
1181 1181
1182 } // namespace chrome 1182 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_client.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698