chrome/browser/chromeos/status/network_menu.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <stddef.h>	7 #include <stddef.h>

8	8

9 #include <algorithm>	9 #include <algorithm>

10	10

11 #include "ash/shell.h"

12 #include "ash/shell_delegate.h"

13 #include "ash/strings/grit/ash_strings.h"	11 #include "ash/strings/grit/ash_strings.h"

14 #include "base/bind.h"	12 #include "base/bind.h"

15 #include "base/logging.h"	13 #include "base/logging.h"

16 #include "base/macros.h"	14 #include "base/macros.h"

17 #include "base/strings/stringprintf.h"	15 #include "base/strings/stringprintf.h"

18 #include "base/strings/utf_string_conversions.h"	16 #include "base/strings/utf_string_conversions.h"

19 #include "chrome/browser/chromeos/mobile_config.h"	17 #include "chrome/browser/chromeos/mobile_config.h"

20 #include "chrome/browser/chromeos/options/network_config_view.h"	18 #include "chrome/browser/chromeos/options/network_config_view.h"

21 #include "chrome/browser/chromeos/sim_dialog_delegate.h"	19 #include "chrome/browser/chromeos/sim_dialog_delegate.h"

22 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"	20 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"

(...skipping 654 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
677 return main_menu_model_.get();	675 return main_menu_model_.get();

678 }	676 }

679	677

680 void NetworkMenu::UpdateMenu() {	678 void NetworkMenu::UpdateMenu() {

681 refreshing_menu_ = true;	679 refreshing_menu_ = true;

682 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());	680 main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());

683 refreshing_menu_ = false;	681 refreshing_menu_ = false;

684 }	682 }

685	683

686 } // namespace chromeos	684 } // namespace chromeos

OLD	NEW