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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 1053013007: Minimized windows should not be activated by another user in multiprofile scenario. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the system crash when add another user into chromeos system. Created 5 years, 8 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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/content_support/gpu_support_impl.h" 7 #include "ash/content_support/gpu_support_impl.h"
8 #include "ash/wm/window_state.h" 8 #include "ash/wm/window_state.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 10 #include "chrome/browser/app_mode/app_mode_utils.h"
(...skipping 21 matching lines...) Expand all
32 #include "components/user_manager/user_manager.h" 32 #include "components/user_manager/user_manager.h"
33 #endif 33 #endif
34 34
35 // static 35 // static
36 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; 36 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
37 37
38 ChromeShellDelegate::ChromeShellDelegate() 38 ChromeShellDelegate::ChromeShellDelegate()
39 : shelf_delegate_(NULL) { 39 : shelf_delegate_(NULL) {
40 instance_ = this; 40 instance_ = this;
41 PlatformInit(); 41 PlatformInit();
42 #if defined(OS_CHROMEOS)
43 is_first_run_ = true;
44 #endif
42 } 45 }
43 46
44 ChromeShellDelegate::~ChromeShellDelegate() { 47 ChromeShellDelegate::~ChromeShellDelegate() {
45 if (instance_ == this) 48 if (instance_ == this)
46 instance_ = NULL; 49 instance_ = NULL;
47 } 50 }
48 51
49 bool ChromeShellDelegate::IsMultiProfilesEnabled() const { 52 bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
50 if (!profiles::IsMultipleProfilesEnabled()) 53 if (!profiles::IsMultipleProfilesEnabled())
51 return false; 54 return false;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 174
172 void ChromeShellDelegate::AddVirtualKeyboardStateObserver( 175 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
173 ash::VirtualKeyboardStateObserver* observer) { 176 ash::VirtualKeyboardStateObserver* observer) {
174 keyboard_state_observer_list_.AddObserver(observer); 177 keyboard_state_observer_list_.AddObserver(observer);
175 } 178 }
176 179
177 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver( 180 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
178 ash::VirtualKeyboardStateObserver* observer) { 181 ash::VirtualKeyboardStateObserver* observer) {
179 keyboard_state_observer_list_.RemoveObserver(observer); 182 keyboard_state_observer_list_.RemoveObserver(observer);
180 } 183 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698