| 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/status/network_menu.h" | 5 #include "chrome/browser/chromeos/status/network_menu.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/resources/grit/ash_resources.h" |
| 9 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 10 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
| 12 #include "ash/strings/grit/ash_strings.h" |
| 11 #include "ash/system/chromeos/network/network_connect.h" | 13 #include "ash/system/chromeos/network/network_connect.h" |
| 12 #include "base/bind.h" | 14 #include "base/bind.h" |
| 13 #include "base/logging.h" | 15 #include "base/logging.h" |
| 14 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
| 16 #include "chrome/browser/chromeos/login/users/user_manager.h" | 18 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 17 #include "chrome/browser/chromeos/mobile_config.h" | 19 #include "chrome/browser/chromeos/mobile_config.h" |
| 18 #include "chrome/browser/chromeos/options/network_config_view.h" | 20 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 19 #include "chrome/browser/chromeos/sim_dialog_delegate.h" | 21 #include "chrome/browser/chromeos/sim_dialog_delegate.h" |
| 20 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" | 22 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" |
| 21 #include "chrome/browser/defaults.h" | 23 #include "chrome/browser/defaults.h" |
| 22 #include "chrome/browser/profiles/profile_manager.h" | 24 #include "chrome/browser/profiles/profile_manager.h" |
| 23 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
| 26 #include "chrome/grit/generated_resources.h" |
| 24 #include "chromeos/network/device_state.h" | 27 #include "chromeos/network/device_state.h" |
| 25 #include "chromeos/network/network_state.h" | 28 #include "chromeos/network/network_state.h" |
| 26 #include "chromeos/network/network_state_handler.h" | 29 #include "chromeos/network/network_state_handler.h" |
| 27 #include "grit/ash_resources.h" | |
| 28 #include "grit/ash_strings.h" | |
| 29 #include "grit/generated_resources.h" | |
| 30 #include "grit/ui_chromeos_strings.h" | |
| 31 #include "third_party/cros_system_api/dbus/service_constants.h" | 30 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 32 #include "ui/base/l10n/l10n_util.h" | 31 #include "ui/base/l10n/l10n_util.h" |
| 33 #include "ui/base/models/menu_model.h" | 32 #include "ui/base/models/menu_model.h" |
| 34 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
| 35 #include "ui/chromeos/network/network_icon.h" | 34 #include "ui/chromeos/network/network_icon.h" |
| 35 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h" |
| 36 #include "ui/gfx/image/image_skia.h" | 36 #include "ui/gfx/image/image_skia.h" |
| 37 | 37 |
| 38 namespace chromeos { | 38 namespace chromeos { |
| 39 | 39 |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 // Offsets for views menu ids (main menu and submenu ids use the same | 42 // Offsets for views menu ids (main menu and submenu ids use the same |
| 43 // namespace). | 43 // namespace). |
| 44 const int kMainIndexMask = 0x1000; | 44 const int kMainIndexMask = 0x1000; |
| 45 const int kMoreIndexMask = 0x4000; | 45 const int kMoreIndexMask = 0x4000; |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 return main_menu_model_.get(); | 670 return main_menu_model_.get(); |
| 671 } | 671 } |
| 672 | 672 |
| 673 void NetworkMenu::UpdateMenu() { | 673 void NetworkMenu::UpdateMenu() { |
| 674 refreshing_menu_ = true; | 674 refreshing_menu_ = true; |
| 675 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions()); | 675 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions()); |
| 676 refreshing_menu_ = false; | 676 refreshing_menu_ = false; |
| 677 } | 677 } |
| 678 | 678 |
| 679 } // namespace chromeos | 679 } // namespace chromeos |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 448423002:
Use a qualified path for grit includes in chrome/browser/chromeos. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src