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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 years, 2 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/chrome_browser_main_extra_parts_views.h" 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
6 6
7 #include "chrome/browser/chrome_browser_main.h" 7 #include "chrome/browser/chrome_browser_main.h"
8 #include "chrome/browser/toolkit_extra_parts.h" 8 #include "chrome/browser/toolkit_extra_parts.h"
9 #include "chrome/browser/ui/views/chrome_views_delegate.h" 9 #include "chrome/browser/ui/views/chrome_views_delegate.h"
10 #include "ui/gfx/screen.h"
oshima 2012/10/10 17:58:23 do you need this?
scottmg 2012/10/10 19:04:47 Done.
10 11
11 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { 12 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
12 } 13 }
13 14
14 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() { 15 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
15 // The delegate needs to be set before any UI is created so that windows 16 // The delegate needs to be set before any UI is created so that windows
16 // display the correct icon. 17 // display the correct icon.
17 if (!views::ViewsDelegate::views_delegate) 18 if (!views::ViewsDelegate::views_delegate)
18 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; 19 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
19 } 20 }
20 21
21 namespace chrome { 22 namespace chrome {
22 23
23 void AddViewsToolkitExtraParts(ChromeBrowserMainParts* main_parts) { 24 void AddViewsToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
24 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); 25 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
25 } 26 }
26 27
27 } // namespace chrome 28 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698