OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/status/network_menu_button.h" | 5 #include "chrome/browser/chromeos/status/network_menu_button.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/chromeos/cros/cros_library.h" | 13 #include "chrome/browser/chromeos/cros/cros_library.h" |
13 #include "chrome/browser/chromeos/options/network_config_view.h" | 14 #include "chrome/browser/chromeos/options/network_config_view.h" |
14 #include "chrome/browser/chromeos/status/status_area_host.h" | 15 #include "chrome/browser/chromeos/status/status_area_host.h" |
15 #include "gfx/canvas_skia.h" | 16 #include "gfx/canvas_skia.h" |
16 #include "gfx/skbitmap_operations.h" | 17 #include "gfx/skbitmap_operations.h" |
17 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
18 #include "grit/theme_resources.h" | 19 #include "grit/theme_resources.h" |
19 #include "views/widget/widget.h" | 20 #include "views/widget/widget.h" |
20 #include "views/window/window.h" | 21 #include "views/window/window.h" |
21 | 22 |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 if (host_->ShouldOpenButtonOptions(this)) { | 602 if (host_->ShouldOpenButtonOptions(this)) { |
602 label = | 603 label = |
603 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG); | 604 l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG); |
604 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, | 605 menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, |
605 SkBitmap(), std::string(), FLAG_OPTIONS)); | 606 SkBitmap(), std::string(), FLAG_OPTIONS)); |
606 } | 607 } |
607 } | 608 } |
608 } | 609 } |
609 | 610 |
610 } // namespace chromeos | 611 } // namespace chromeos |
OLD | NEW |