chrome/browser/chromeos/options/network_config_view.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

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

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build Created 6 years, 4 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 | « chrome/browser/chromeos/options/cert_library.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

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 "ash/shell.h"	9 #include "ash/shell.h"

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

13 #include "chrome/browser/chromeos/options/network_property_ui_data.h"	13 #include "chrome/browser/chromeos/options/network_property_ui_data.h"

14 #include "chrome/browser/chromeos/options/vpn_config_view.h"	14 #include "chrome/browser/chromeos/options/vpn_config_view.h"

15 #include "chrome/browser/chromeos/options/wifi_config_view.h"	15 #include "chrome/browser/chromeos/options/wifi_config_view.h"

16 #include "chrome/browser/chromeos/options/wimax_config_view.h"	16 #include "chrome/browser/chromeos/options/wimax_config_view.h"

17 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

18 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_finder.h"	19 #include "chrome/browser/ui/browser_finder.h"

20 #include "chrome/browser/ui/browser_window.h"	20 #include "chrome/browser/ui/browser_window.h"

21 #include "chrome/browser/ui/host_desktop.h"	21 #include "chrome/browser/ui/host_desktop.h"

	22 #include "chrome/grit/chromium_strings.h"

	23 #include "chrome/grit/generated_resources.h"

	24 #include "chrome/grit/locale_settings.h"

	25 #include "chrome/grit/theme_resources.h"

22 #include "chromeos/login/login_state.h"	26 #include "chromeos/login/login_state.h"

23 #include "chromeos/network/network_state.h"	27 #include "chromeos/network/network_state.h"

24 #include "chromeos/network/network_state_handler.h"	28 #include "chromeos/network/network_state_handler.h"

25 #include "components/user_manager/user.h"	29 #include "components/user_manager/user.h"

26 #include "grit/chromium_strings.h"

27 #include "grit/generated_resources.h"

28 #include "grit/locale_settings.h"

29 #include "grit/theme_resources.h"

30 #include "ui/accessibility/ax_view_state.h"	30 #include "ui/accessibility/ax_view_state.h"

31 #include "ui/aura/window_event_dispatcher.h"	31 #include "ui/aura/window_event_dispatcher.h"

32 #include "ui/base/l10n/l10n_util.h"	32 #include "ui/base/l10n/l10n_util.h"

33 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

34 #include "ui/gfx/image/image.h"	34 #include "ui/gfx/image/image.h"

35 #include "ui/gfx/rect.h"	35 #include "ui/gfx/rect.h"

36 #include "ui/views/controls/button/label_button.h"	36 #include "ui/views/controls/button/label_button.h"

37 #include "ui/views/controls/image_view.h"	37 #include "ui/views/controls/image_view.h"

38 #include "ui/views/layout/layout_constants.h"	38 #include "ui/views/layout/layout_constants.h"

39 #include "ui/views/widget/widget.h"	39 #include "ui/views/widget/widget.h"

(...skipping 311 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
351 image_view_ = new views::ImageView();	351 image_view_ = new views::ImageView();

352 // Disable \|image_view_\| so mouse events propagate to the parent.	352 // Disable \|image_view_\| so mouse events propagate to the parent.

353 image_view_->SetEnabled(false);	353 image_view_->SetEnabled(false);

354 image_view_->SetImage(image_);	354 image_view_->SetImage(image_);

355 image_view_->SetTooltipText(	355 image_view_->SetTooltipText(

356 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));	356 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));

357 AddChildView(image_view_);	357 AddChildView(image_view_);

358 }	358 }

359	359

360 } // namespace chromeos	360 } // namespace chromeos

OLD	NEW