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

Side by Side Diff: chrome/browser/chromeos/webui/network_menu_ui.cc

Issue 6594063: Update a bunch of files to the new location of browser_thread.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 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/webui/network_menu_ui.h" 5 #include "chrome/browser/chromeos/webui/network_menu_ui.h"
6 6
7 #include "base/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/chromeos/status/network_menu.h" 11 #include "chrome/browser/chromeos/status/network_menu.h"
13 #include "chrome/browser/chromeos/views/native_menu_webui.h" 12 #include "chrome/browser/chromeos/views/native_menu_webui.h"
14 #include "chrome/browser/chromeos/views/webui_menu_widget.h" 13 #include "chrome/browser/chromeos/views/webui_menu_widget.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/tab_contents/tab_contents.h"
17 #include "chrome/browser/ui/webui/theme_source.h" 15 #include "chrome/browser/ui/webui/theme_source.h"
18 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
17 #include "content/browser/browser_thread.h"
18 #include "content/browser/tab_contents/tab_contents.h"
19 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
20 #include "grit/browser_resources.h" 20 #include "grit/browser_resources.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "views/controls/menu/menu_2.h" 23 #include "views/controls/menu/menu_2.h"
24 24
25 namespace { 25 namespace {
26 26
27 class NetworkMenuSourceDelegate : public chromeos::MenuSourceDelegate { 27 class NetworkMenuSourceDelegate : public chromeos::MenuSourceDelegate {
28 public: 28 public:
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 } 189 }
190 190
191 views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) { 191 views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) {
192 views::Menu2* menu = new views::Menu2(model); 192 views::Menu2* menu = new views::Menu2(model);
193 NativeMenuWebUI::SetMenuURL( 193 NativeMenuWebUI::SetMenuURL(
194 menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu))); 194 menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));
195 return menu; 195 return menu;
196 } 196 }
197 197
198 } // namespace chromeos 198 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/webui/mobile_setup_ui.cc ('k') | chrome/browser/chromeos/webui/register_page_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698