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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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/status/network_menu.h" 5 #include "chrome/browser/chromeos/status/network_menu.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "ash/common/system/chromeos/network/network_icon.h"
12 #include "ash/strings/grit/ash_strings.h" 11 #include "ash/strings/grit/ash_strings.h"
12 #include "ash/system/network/network_icon.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "chrome/browser/chromeos/mobile_config.h" 17 #include "chrome/browser/chromeos/mobile_config.h"
18 #include "chrome/browser/chromeos/options/network_config_view.h" 18 #include "chrome/browser/chromeos/options/network_config_view.h"
19 #include "chrome/browser/chromeos/sim_dialog_delegate.h" 19 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
20 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" 20 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
21 #include "chrome/browser/defaults.h" 21 #include "chrome/browser/defaults.h"
22 #include "chrome/browser/profiles/profile_manager.h" 22 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 return main_menu_model_.get(); 676 return main_menu_model_.get();
677 } 677 }
678 678
679 void NetworkMenu::UpdateMenu() { 679 void NetworkMenu::UpdateMenu() {
680 refreshing_menu_ = true; 680 refreshing_menu_ = true;
681 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions()); 681 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());
682 refreshing_menu_ = false; 682 refreshing_menu_ = false;
683 } 683 }
684 684
685 } // namespace chromeos 685 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698