OLD | NEW |
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/options/network_config_view.h" | 5 #include "chrome/browser/chromeos/options/network_config_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 namespace { | 48 namespace { |
49 | 49 |
50 // Used to check if a network config dialog is already showing. | 50 // Used to check if a network config dialog is already showing. |
51 NetworkConfigView* g_instance = nullptr; | 51 NetworkConfigView* g_instance = nullptr; |
52 | 52 |
53 gfx::NativeWindow GetParentForUnhostedDialog() { | 53 gfx::NativeWindow GetParentForUnhostedDialog() { |
54 if (LoginDisplayHost::default_host()) { | 54 if (LoginDisplayHost::default_host()) { |
55 // TODO(jamescook): LoginDisplayHost has the wrong native window in mash. | 55 // TODO(jamescook): LoginDisplayHost has the wrong native window in mash. |
56 // This will fix itself when mash converts from ui::Window to aura::Window. | 56 // This will fix itself when mash converts from ui::Window to aura::Window. |
57 // http://crbug.com/659155 | 57 // http://crbug.com/659155 |
58 if (!ash_util::IsRunningInMash()) | 58 if (!IsRunningInMash()) |
59 return LoginDisplayHost::default_host()->GetNativeWindow(); | 59 return LoginDisplayHost::default_host()->GetNativeWindow(); |
60 } else { | 60 } else { |
61 Browser* browser = chrome::FindTabbedBrowser( | 61 Browser* browser = chrome::FindTabbedBrowser( |
62 ProfileManager::GetPrimaryUserProfile(), true); | 62 ProfileManager::GetPrimaryUserProfile(), true); |
63 if (browser) | 63 if (browser) |
64 return browser->window()->GetNativeWindow(); | 64 return browser->window()->GetNativeWindow(); |
65 } | 65 } |
66 return nullptr; | 66 return nullptr; |
67 } | 67 } |
68 | 68 |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 } | 336 } |
337 | 337 |
338 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {} | 338 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {} |
339 | 339 |
340 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const { | 340 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const { |
341 return (managed_ && visible()) ? image_view_->GetPreferredSize() | 341 return (managed_ && visible()) ? image_view_->GetPreferredSize() |
342 : gfx::Size(); | 342 : gfx::Size(); |
343 } | 343 } |
344 | 344 |
345 } // namespace chromeos | 345 } // namespace chromeos |
OLD | NEW |