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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2240353002: move switch Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Virtual keyboard non-sticky mode changes. Created 4 years, 4 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 137 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
138 #include "media/audio/sounds/sounds_manager.h" 138 #include "media/audio/sounds/sounds_manager.h"
139 #include "net/base/network_change_notifier.h" 139 #include "net/base/network_change_notifier.h"
140 #include "net/socket/ssl_server_socket.h" 140 #include "net/socket/ssl_server_socket.h"
141 #include "net/url_request/url_request.h" 141 #include "net/url_request/url_request.h"
142 #include "net/url_request/url_request_context_getter.h" 142 #include "net/url_request/url_request_context_getter.h"
143 #include "printing/backend/print_backend.h" 143 #include "printing/backend/print_backend.h"
144 #include "ui/base/ime/chromeos/ime_keyboard.h" 144 #include "ui/base/ime/chromeos/ime_keyboard.h"
145 #include "ui/base/ime/chromeos/input_method_manager.h" 145 #include "ui/base/ime/chromeos/input_method_manager.h"
146 #include "ui/base/touch/touch_device.h" 146 #include "ui/base/touch/touch_device.h"
147 #include "ui/base/ui_base_switches.h"
147 #include "ui/events/event_utils.h" 148 #include "ui/events/event_utils.h"
148 149
149 #if defined(ENABLE_RLZ) 150 #if defined(ENABLE_RLZ)
150 #include "components/rlz/rlz_tracker.h" 151 #include "components/rlz/rlz_tracker.h"
151 #endif 152 #endif
152 153
153 // Exclude X11 dependents for ozone 154 // Exclude X11 dependents for ozone
154 #if defined(USE_X11) 155 #if defined(USE_X11)
155 #include "chrome/browser/chromeos/device_uma.h" 156 #include "chrome/browser/chromeos/device_uma.h"
156 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 157 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 BootTimesRecorder::Get()->AddLogoutTimeMarker("LogoutDone", false); 302 BootTimesRecorder::Get()->AddLogoutTimeMarker("LogoutDone", false);
302 BootTimesRecorder::Get()->WriteLogoutTimes(); 303 BootTimesRecorder::Get()->WriteLogoutTimes();
303 } 304 }
304 305
305 // content::BrowserMainParts and ChromeBrowserMainExtraParts overrides --------- 306 // content::BrowserMainParts and ChromeBrowserMainExtraParts overrides ---------
306 307
307 void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() { 308 void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {
308 base::CommandLine* singleton_command_line = 309 base::CommandLine* singleton_command_line =
309 base::CommandLine::ForCurrentProcess(); 310 base::CommandLine::ForCurrentProcess();
310 311
312 singleton_command_line->AppendSwitch(::switches::kUseNewVKWindowBehavior);
311 if (parsed_command_line().HasSwitch(switches::kGuestSession)) { 313 if (parsed_command_line().HasSwitch(switches::kGuestSession)) {
312 // Disable sync and extensions if we're in "browse without sign-in" mode. 314 // Disable sync and extensions if we're in "browse without sign-in" mode.
313 singleton_command_line->AppendSwitch(::switches::kDisableSync); 315 singleton_command_line->AppendSwitch(::switches::kDisableSync);
314 singleton_command_line->AppendSwitch(::switches::kDisableExtensions); 316 singleton_command_line->AppendSwitch(::switches::kDisableExtensions);
315 browser_defaults::bookmarks_enabled = false; 317 browser_defaults::bookmarks_enabled = false;
316 } 318 }
317 319
318 // If we're not running on real Chrome OS hardware (or under VM), and are not 320 // If we're not running on real Chrome OS hardware (or under VM), and are not
319 // showing the login manager or attempting a command line login, login with a 321 // showing the login manager or attempting a command line login, login with a
320 // stub user. 322 // stub user.
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 // Destroy DBus services immediately after threads are stopped. 876 // Destroy DBus services immediately after threads are stopped.
875 dbus_services_.reset(); 877 dbus_services_.reset();
876 878
877 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 879 ChromeBrowserMainPartsLinux::PostDestroyThreads();
878 880
879 // Destroy DeviceSettingsService after g_browser_process. 881 // Destroy DeviceSettingsService after g_browser_process.
880 DeviceSettingsService::Shutdown(); 882 DeviceSettingsService::Shutdown();
881 } 883 }
882 884
883 } // namespace chromeos 885 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698