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

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

Issue 10698111: browser: Move more files into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/frame/browser_frame.h" 5 #include "chrome/browser/ui/views/frame/browser_frame.h"
6 6
7 #include "base/chromeos/chromeos_version.h"
7 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
8 #include "base/chromeos/chromeos_version.h"
9 #include "chrome/browser/themes/theme_service.h" 9 #include "chrome/browser/themes/theme_service.h"
10 #include "chrome/browser/themes/theme_service_factory.h" 10 #include "chrome/browser/themes/theme_service_factory.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_list.h" 12 #include "chrome/browser/ui/browser_list.h"
13 #include "chrome/browser/ui/browser_window_state.h" 13 #include "chrome/browser/ui/browser_window_state.h"
14 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 14 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
15 #include "chrome/browser/ui/views/frame/browser_root_view.h" 15 #include "chrome/browser/ui/views/frame/browser_root_view.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 16 #include "chrome/browser/ui/views/frame/browser_view.h"
17 #include "chrome/browser/ui/views/frame/native_browser_frame.h" 17 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 return root_view_; 118 return root_view_;
119 } 119 }
120 120
121 views::NonClientFrameView* BrowserFrame::CreateNonClientFrameView() { 121 views::NonClientFrameView* BrowserFrame::CreateNonClientFrameView() {
122 #if defined(OS_WIN) && !defined(USE_AURA) 122 #if defined(OS_WIN) && !defined(USE_AURA)
123 if (ShouldUseNativeFrame()) { 123 if (ShouldUseNativeFrame()) {
124 browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_); 124 browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
125 } else { 125 } else {
126 #endif 126 #endif
127 browser_frame_view_ = 127 browser_frame_view_ =
128 browser::CreateBrowserNonClientFrameView(this, browser_view_); 128 chrome::CreateBrowserNonClientFrameView(this, browser_view_);
129 #if defined(OS_WIN) && !defined(USE_AURA) 129 #if defined(OS_WIN) && !defined(USE_AURA)
130 } 130 }
131 #endif 131 #endif
132 return browser_frame_view_; 132 return browser_frame_view_;
133 } 133 }
134 134
135 bool BrowserFrame::GetAccelerator(int command_id, 135 bool BrowserFrame::GetAccelerator(int command_id,
136 ui::Accelerator* accelerator) { 136 ui::Accelerator* accelerator) {
137 return browser_view_->GetAccelerator(command_id, accelerator); 137 return browser_view_->GetAccelerator(command_id, accelerator);
138 } 138 }
(...skipping 12 matching lines...) Expand all
151 // set ourselves as the last active browser window to ensure that we get 151 // set ourselves as the last active browser window to ensure that we get
152 // treated as such by the rest of Chrome. 152 // treated as such by the rest of Chrome.
153 BrowserList::SetLastActive(browser_view_->browser()); 153 BrowserList::SetLastActive(browser_view_->browser());
154 } 154 }
155 Widget::OnNativeWidgetActivationChanged(active); 155 Widget::OnNativeWidgetActivationChanged(active);
156 } 156 }
157 157
158 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { 158 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
159 return browser_frame_view_->avatar_button(); 159 return browser_frame_view_->avatar_button();
160 } 160 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table_unittest.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698