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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 7054052: Move more from Window onto Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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) 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/views/frame/browser_frame.h" 5 #include "chrome/browser/ui/views/frame/browser_frame.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/themes/theme_service.h" 8 #include "chrome/browser/themes/theme_service.h"
9 #include "chrome/browser/themes/theme_service_factory.h" 9 #include "chrome/browser/themes/theme_service_factory.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 bool BrowserFrame::GetAccelerator(int command_id, 117 bool BrowserFrame::GetAccelerator(int command_id,
118 ui::Accelerator* accelerator) { 118 ui::Accelerator* accelerator) {
119 return browser_view_->GetAccelerator(command_id, accelerator); 119 return browser_view_->GetAccelerator(command_id, accelerator);
120 } 120 }
121 121
122 ThemeProvider* BrowserFrame::GetThemeProvider() const { 122 ThemeProvider* BrowserFrame::GetThemeProvider() const {
123 return ThemeServiceFactory::GetForProfile( 123 return ThemeServiceFactory::GetForProfile(
124 browser_view_->browser()->profile()); 124 browser_view_->browser()->profile());
125 } 125 }
126 126
127 void BrowserFrame::OnNativeWindowActivationChanged(bool active) { 127 void BrowserFrame::OnNativeWidgetActivationChanged(bool active) {
128 if (active) { 128 if (active) {
129 // When running under remote desktop, if the remote desktop client is not 129 // When running under remote desktop, if the remote desktop client is not
130 // active on the users desktop, then none of the windows contained in the 130 // active on the users desktop, then none of the windows contained in the
131 // remote desktop will be activated. However, NativeWindowWin::Activate() 131 // remote desktop will be activated. However, NativeWindowWin::Activate()
132 // will still bring this browser window to the foreground. We explicitly 132 // will still bring this browser window to the foreground. We explicitly
133 // set ourselves as the last active browser window to ensure that we get 133 // set ourselves as the last active browser window to ensure that we get
134 // treated as such by the rest of Chrome. 134 // treated as such by the rest of Chrome.
135 BrowserList::SetLastActive(browser_view_->browser()); 135 BrowserList::SetLastActive(browser_view_->browser());
136 } 136 }
137 Window::OnNativeWindowActivationChanged(active); 137 Window::OnNativeWidgetActivationChanged(active);
138 } 138 }
139 139
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698