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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years 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/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 "ui/views/widget/widget.h"
14 #endif 14 #endif
15 15
16 namespace { 16 namespace {
17 17
18 // If true, overrides IsMoreWebUI flag. 18 // If true, overrides IsMoreWebUI flag.
19 bool override_more_webui_ = false; 19 bool override_more_webui_ = false;
20 20
21 } // namespace 21 } // namespace
22 22
23 ChromeWebUI::ChromeWebUI(TabContents* contents) 23 ChromeWebUI::ChromeWebUI(TabContents* contents)
(...skipping 17 matching lines...) Expand all
41 switches::kUseMoreWebUI) || override_more_webui_; 41 switches::kUseMoreWebUI) || override_more_webui_;
42 #if defined(TOOLKIT_VIEWS) 42 #if defined(TOOLKIT_VIEWS)
43 more_webui |= views::Widget::IsPureViews(); 43 more_webui |= views::Widget::IsPureViews();
44 #endif 44 #endif
45 return more_webui; 45 return more_webui;
46 } 46 }
47 47
48 void ChromeWebUI::OverrideMoreWebUI(bool use_more_webui) { 48 void ChromeWebUI::OverrideMoreWebUI(bool use_more_webui) {
49 override_more_webui_ = use_more_webui; 49 override_more_webui_ = use_more_webui;
50 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698