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

Side by Side Diff: chrome/browser/chromeos/dom_ui/menu_ui.cc

Issue 4273003: Disable DOMUI menu by default. a part of reverting 6497 feature. (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
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/menu_ui.h" 5 #include "chrome/browser/chromeos/dom_ui/menu_ui.h"
6 6
7 #include "app/menus/menu_model.h" 7 #include "app/menus/menu_model.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 int menu_css_id) { 642 int menu_css_id) {
643 return new MenuUIHTMLSource(delegate, 643 return new MenuUIHTMLSource(delegate,
644 source_name, 644 source_name,
645 menu_class, 645 menu_class,
646 menu_source_id, 646 menu_source_id,
647 menu_css_id); 647 menu_css_id);
648 } 648 }
649 649
650 // static 650 // static
651 bool MenuUI::IsEnabled() { 651 bool MenuUI::IsEnabled() {
652 return !CommandLine::ForCurrentProcess()->HasSwitch( 652 return CommandLine::ForCurrentProcess()->HasSwitch(
653 switches::kDisableDOMUIMenu); 653 switches::kEnableDOMUIMenu);
654 } 654 }
655 655
656 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() { 656 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() {
657 return CreateMenuUIHTMLSource(NULL, 657 return CreateMenuUIHTMLSource(NULL,
658 chrome::kChromeUIMenu, 658 chrome::kChromeUIMenu,
659 "Menu" /* class name */, 659 "Menu" /* class name */,
660 kNoExtraResource, 660 kNoExtraResource,
661 kNoExtraResource); 661 kNoExtraResource);
662 } 662 }
663 663
664 } // namespace chromeos 664 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698