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

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui.cc

Issue 7861024: Adds testing infrastructure to web_ui_browsertest to support testing HtmlDialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove inline override function declaration for clang. Created 9 years, 3 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
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui.h ('k') | chrome/browser/ui/webui/html_dialog_ui.cc » ('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) 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/ui/webui/chrome_web_ui.h" 5 #include "chrome/browser/ui/webui/chrome_web_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "content/browser/tab_contents/tab_contents.h" 10 #include "content/browser/tab_contents/tab_contents.h"
11 11
12 #if defined(TOOLKIT_VIEWS) 12 #if defined(TOOLKIT_VIEWS)
13 #include "views/widget/widget.h" 13 #include "views/widget/widget.h"
14 #endif 14 #endif
15 15
16 namespace {
17
18 // If true, overrides IsMoreWebUI flag.
19 bool override_more_webui_ = false;
20
21 } // namespace
22
16 ChromeWebUI::ChromeWebUI(TabContents* contents) 23 ChromeWebUI::ChromeWebUI(TabContents* contents)
17 : WebUI(contents), 24 : WebUI(contents),
18 force_bookmark_bar_visible_(false) { 25 force_bookmark_bar_visible_(false) {
19 } 26 }
20 27
21 ChromeWebUI::~ChromeWebUI() { 28 ChromeWebUI::~ChromeWebUI() {
22 } 29 }
23 30
24 Profile* ChromeWebUI::GetProfile() const { 31 Profile* ChromeWebUI::GetProfile() const {
25 return Profile::FromBrowserContext(tab_contents()->browser_context()); 32 return Profile::FromBrowserContext(tab_contents()->browser_context());
26 } 33 }
27 34
28 // static 35 // static
29 bool ChromeWebUI::IsMoreWebUI() { 36 bool ChromeWebUI::IsMoreWebUI() {
30 bool more_webui = CommandLine::ForCurrentProcess()->HasSwitch( 37 bool more_webui = CommandLine::ForCurrentProcess()->HasSwitch(
31 switches::kUseMoreWebUI); 38 switches::kUseMoreWebUI) || override_more_webui_;
32 #if defined(TOOLKIT_VIEWS) 39 #if defined(TOOLKIT_VIEWS)
33 more_webui |= views::Widget::IsPureViews(); 40 more_webui |= views::Widget::IsPureViews();
34 #endif 41 #endif
35 return more_webui; 42 return more_webui;
36 } 43 }
44
45 void ChromeWebUI::OverrideMoreWebUI(bool use_more_webui) {
46 override_more_webui_ = use_more_webui;
47 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui.h ('k') | chrome/browser/ui/webui/html_dialog_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698