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

Side by Side Diff: chrome/browser/chromeos/login/login_display_host_impl.cc

Issue 145703004: Remove flags for enabling Drive offline mode for M34 launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | 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/chromeos/login/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 CrasAudioHandler::Get()->RemoveAudioObserver(this); 368 CrasAudioHandler::Get()->RemoveAudioObserver(this);
369 369
370 views::FocusManager::set_arrow_key_traversal_enabled(false); 370 views::FocusManager::set_arrow_key_traversal_enabled(false);
371 ResetLoginWindowAndView(); 371 ResetLoginWindowAndView();
372 372
373 // Let chrome process exit after login/oobe screen if needed. 373 // Let chrome process exit after login/oobe screen if needed.
374 chrome::EndKeepAlive(); 374 chrome::EndKeepAlive();
375 375
376 default_host_ = NULL; 376 default_host_ = NULL;
377 // TODO(tengs): This should be refactored. See crbug.com/314934. 377 // TODO(tengs): This should be refactored. See crbug.com/314934.
378 if (CommandLine::ForCurrentProcess()->HasSwitch( 378 if (UserManager::Get()->IsCurrentUserNew()) {
379 switches::kEnableDriveOfflineFirstRun)) { 379 // DriveOptInController will delete itself when finished.
380 if (UserManager::Get()->IsCurrentUserNew()) { 380 (new DriveFirstRunController(
381 // DriveOptInController will delete itself when finished. 381 ProfileManager::GetActiveUserProfile()))->EnableOfflineMode();
382 (new DriveFirstRunController(
383 ProfileManager::GetActiveUserProfile()))->EnableOfflineMode();
384 }
385 } 382 }
386 } 383 }
387 384
388 //////////////////////////////////////////////////////////////////////////////// 385 ////////////////////////////////////////////////////////////////////////////////
389 // LoginDisplayHostImpl, LoginDisplayHost implementation: 386 // LoginDisplayHostImpl, LoginDisplayHost implementation:
390 387
391 LoginDisplay* LoginDisplayHostImpl::CreateLoginDisplay( 388 LoginDisplay* LoginDisplayHostImpl::CreateLoginDisplay(
392 LoginDisplay::Delegate* delegate) { 389 LoginDisplay::Delegate* delegate) {
393 webui_login_display_ = new WebUILoginDisplay(delegate); 390 webui_login_display_ = new WebUILoginDisplay(delegate);
394 webui_login_display_->set_background_bounds(background_bounds()); 391 webui_login_display_->set_background_bounds(background_bounds());
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 1192
1196 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1193 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1197 new locale_util::SwitchLanguageCallback( 1194 new locale_util::SwitchLanguageCallback(
1198 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1195 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1199 1196
1200 // Do not load locale keyboards here. 1197 // Do not load locale keyboards here.
1201 locale_util::SwitchLanguage(locale, false, callback.Pass()); 1198 locale_util::SwitchLanguage(locale, false, callback.Pass());
1202 } 1199 }
1203 1200
1204 } // namespace chromeos 1201 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698