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

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 2911303003: chromeos: Remove SystemTrayDelegate::GetIMEManagedMessage() (Closed)
Patch Set: rebase Created 3 years, 6 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/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"
11 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 11 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
12 #include "chrome/browser/chromeos/options/network_property_ui_data.h" 12 #include "chrome/browser/chromeos/options/network_property_ui_data.h"
13 #include "chrome/browser/chromeos/options/vpn_config_view.h" 13 #include "chrome/browser/chromeos/options/vpn_config_view.h"
14 #include "chrome/browser/chromeos/options/wifi_config_view.h" 14 #include "chrome/browser/chromeos/options/wifi_config_view.h"
15 #include "chrome/browser/chromeos/options/wimax_config_view.h" 15 #include "chrome/browser/chromeos/options/wimax_config_view.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/ash/ash_util.h" 17 #include "chrome/browser/ui/ash/ash_util.h"
18 #include "chrome/browser/ui/ash/system_tray_client.h" 18 #include "chrome/browser/ui/ash/system_tray_client.h"
19 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/browser_dialogs.h" 20 #include "chrome/browser/ui/browser_dialogs.h"
21 #include "chrome/browser/ui/browser_finder.h" 21 #include "chrome/browser/ui/browser_finder.h"
22 #include "chrome/browser/ui/browser_window.h" 22 #include "chrome/browser/ui/browser_window.h"
23 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
24 #include "chrome/grit/locale_settings.h" 24 #include "chrome/grit/locale_settings.h"
25 #include "chromeos/login/login_state.h" 25 #include "chromeos/login/login_state.h"
26 #include "chromeos/network/network_state.h" 26 #include "chromeos/network/network_state.h"
27 #include "chromeos/network/network_state_handler.h" 27 #include "chromeos/network/network_state_handler.h"
28 #include "components/device_event_log/device_event_log.h" 28 #include "components/device_event_log/device_event_log.h"
29 #include "components/strings/grit/components_strings.h"
29 #include "components/user_manager/user.h" 30 #include "components/user_manager/user.h"
30 #include "ui/accessibility/ax_node_data.h" 31 #include "ui/accessibility/ax_node_data.h"
31 #include "ui/aura/window_event_dispatcher.h" 32 #include "ui/aura/window_event_dispatcher.h"
32 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/material_design/material_design_controller.h" 34 #include "ui/base/material_design/material_design_controller.h"
34 #include "ui/gfx/color_palette.h" 35 #include "ui/gfx/color_palette.h"
35 #include "ui/gfx/geometry/rect.h" 36 #include "ui/gfx/geometry/rect.h"
36 #include "ui/gfx/image/image.h" 37 #include "ui/gfx/image/image.h"
37 #include "ui/gfx/paint_vector_icon.h" 38 #include "ui/gfx/paint_vector_icon.h"
38 #include "ui/vector_icons/vector_icons.h" 39 #include "ui/vector_icons/vector_icons.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 339 }
339 340
340 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {} 341 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {}
341 342
342 gfx::Size ControlledSettingIndicatorView::CalculatePreferredSize() const { 343 gfx::Size ControlledSettingIndicatorView::CalculatePreferredSize() const {
343 return (managed_ && visible()) ? image_view_->GetPreferredSize() 344 return (managed_ && visible()) ? image_view_->GetPreferredSize()
344 : gfx::Size(); 345 : gfx::Size();
345 } 346 }
346 347
347 } // namespace chromeos 348 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_support_host.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698