chrome/browser/chromeos/dom_ui/network_menu_ui.cc - Issue 4710001: Split out command IDs from chrome_dll_resource.h.

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/dom_ui/network_menu_ui.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/dom_ui/network_menu_ui.h"	5 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "base/string_number_conversions.h"	9 #include "base/string_number_conversions.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "chrome/app/chrome_dll_resource.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #include "chrome/browser/browser_thread.h"	12 #include "chrome/browser/browser_thread.h"

13 #include "chrome/browser/chromeos/status/network_menu.h"	13 #include "chrome/browser/chromeos/status/network_menu.h"

14 #include "chrome/browser/chromeos/views/domui_menu_widget.h"	14 #include "chrome/browser/chromeos/views/domui_menu_widget.h"

15 #include "chrome/browser/chromeos/views/native_menu_domui.h"	15 #include "chrome/browser/chromeos/views/native_menu_domui.h"

16 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"	16 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"

17 #include "chrome/browser/tab_contents/tab_contents.h"	17 #include "chrome/browser/tab_contents/tab_contents.h"

18 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.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"

(...skipping 170 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
192 }	192 }

193	193

194 views::Menu2* NetworkMenuUI::CreateMenu2(menus::MenuModel* model) {	194 views::Menu2* NetworkMenuUI::CreateMenu2(menus::MenuModel* model) {

195 views::Menu2* menu = new views::Menu2(model);	195 views::Menu2* menu = new views::Menu2(model);

196 NativeMenuDOMUI::SetMenuURL(	196 NativeMenuDOMUI::SetMenuURL(

197 menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));	197 menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));

198 return menu;	198 return menu;

199 }	199 }

200	200

201 } // namespace chromeos	201 } // namespace chromeos

OLD	NEW