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

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

Issue 841103003: Fix WeakPtrFactory member in LoginDisplayHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 LoginDisplayHost* LoginDisplayHostImpl::default_host_ = NULL; 265 LoginDisplayHost* LoginDisplayHostImpl::default_host_ = NULL;
266 266
267 // static 267 // static
268 const int LoginDisplayHostImpl::kShowLoginWebUIid = 0x1111; 268 const int LoginDisplayHostImpl::kShowLoginWebUIid = 0x1111;
269 269
270 //////////////////////////////////////////////////////////////////////////////// 270 ////////////////////////////////////////////////////////////////////////////////
271 // LoginDisplayHostImpl, public 271 // LoginDisplayHostImpl, public
272 272
273 LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds) 273 LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
274 : background_bounds_(background_bounds), 274 : background_bounds_(background_bounds),
275 pointer_factory_(this),
276 shutting_down_(false), 275 shutting_down_(false),
277 oobe_progress_bar_visible_(false), 276 oobe_progress_bar_visible_(false),
278 session_starting_(false), 277 session_starting_(false),
279 login_window_(NULL), 278 login_window_(NULL),
280 login_view_(NULL), 279 login_view_(NULL),
281 webui_login_display_(NULL), 280 webui_login_display_(NULL),
282 is_showing_login_(false), 281 is_showing_login_(false),
283 is_wallpaper_loaded_(false), 282 is_wallpaper_loaded_(false),
284 status_area_saved_visibility_(false), 283 status_area_saved_visibility_(false),
285 crash_count_(0), 284 crash_count_(0),
286 restore_path_(RESTORE_UNKNOWN), 285 restore_path_(RESTORE_UNKNOWN),
287 finalize_animation_type_(ANIMATION_WORKSPACE), 286 finalize_animation_type_(ANIMATION_WORKSPACE),
288 startup_sound_played_(false), 287 startup_sound_played_(false),
289 startup_sound_honors_spoken_feedback_(false), 288 startup_sound_honors_spoken_feedback_(false),
290 is_observing_keyboard_(false), 289 is_observing_keyboard_(false),
290 pointer_factory_(this),
291 animation_weak_ptr_factory_(this) { 291 animation_weak_ptr_factory_(this) {
292 DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this); 292 DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
293 CrasAudioHandler::Get()->AddAudioObserver(this); 293 CrasAudioHandler::Get()->AddAudioObserver(this);
294 if (keyboard::KeyboardController::GetInstance()) { 294 if (keyboard::KeyboardController::GetInstance()) {
295 keyboard::KeyboardController::GetInstance()->AddObserver(this); 295 keyboard::KeyboardController::GetInstance()->AddObserver(this);
296 is_observing_keyboard_ = true; 296 is_observing_keyboard_ = true;
297 } 297 }
298 298
299 #if !defined(USE_ATHENA) 299 #if !defined(USE_ATHENA)
300 ash::Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this); 300 ash::Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this);
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 1275
1276 locale_util::SwitchLanguageCallback callback( 1276 locale_util::SwitchLanguageCallback callback(
1277 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))); 1277 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));
1278 1278
1279 // Load locale keyboards here. Hardware layout would be automatically enabled. 1279 // Load locale keyboards here. Hardware layout would be automatically enabled.
1280 locale_util::SwitchLanguage( 1280 locale_util::SwitchLanguage(
1281 locale, true, true /* login_layouts_only */, callback); 1281 locale, true, true /* login_layouts_only */, callback);
1282 } 1282 }
1283 1283
1284 } // namespace chromeos 1284 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698