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

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

Issue 6811025: Change status button menu implementation from Menu2 to MenuItemView. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed crash in VPN submenu. Created 9 years, 8 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_dropdown_button.h" 5 #include "chrome/browser/chromeos/status/network_dropdown_button.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/chromeos/cros/cros_library.h" 8 #include "chrome/browser/chromeos/cros/cros_library.h"
9 #include "chrome/browser/chromeos/options/network_config_view.h" 9 #include "chrome/browser/chromeos/options/network_config_view.h"
10 #include "chrome/browser/chromeos/status/status_area_host.h" 10 #include "chrome/browser/chromeos/status/status_area_host.h"
11 #include "grit/generated_resources.h" 11 #include "grit/generated_resources.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 animation_connecting_.Stop(); 118 animation_connecting_.Stop();
119 SetIcon(SkBitmap()); 119 SetIcon(SkBitmap());
120 SetText(UTF16ToWide( 120 SetText(UTF16ToWide(
121 l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE))); 121 l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE)));
122 } 122 }
123 123
124 SchedulePaint(); 124 SchedulePaint();
125 UpdateMenu(); 125 UpdateMenu();
126 } 126 }
127 127
128 // NetworkDropdownButton, NetworkMenu implementation: --------------------------
129
130 bool NetworkDropdownButton::IsBrowserMode() const {
131 return browser_mode_;
132 }
133
134 views::MenuButton* NetworkDropdownButton::GetMenuButton() {
135 return this;
136 }
137
138 gfx::NativeWindow NetworkDropdownButton::GetNativeWindow() const {
139 return parent_window_;
140 }
141
142 void NetworkDropdownButton::OpenButtonOptions() {
143 }
144
145 bool NetworkDropdownButton::ShouldOpenButtonOptions() const {
146 return false;
147 }
148
128 } // namespace chromeos 149 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698