OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/chromeos/main_menu.h" | 5 #include "chrome/browser/chromeos/main_menu.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "app/gfx/insets.h" | 10 #include "app/gfx/insets.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 // correctly when this happens. | 237 // correctly when this happens. |
238 gtk_widget_set_size_request(popup_->GetNativeView(), | 238 gtk_widget_set_size_request(popup_->GetNativeView(), |
239 new_bounds.width(), new_bounds.height()); | 239 new_bounds.width(), new_bounds.height()); |
240 gfx::Size rwhv_size = CalculateRWHVSize(new_bounds.size()); | 240 gfx::Size rwhv_size = CalculateRWHVSize(new_bounds.size()); |
241 popup_->PositionChild(rwhv_->GetNativeView(), kRendererX, kRendererY, | 241 popup_->PositionChild(rwhv_->GetNativeView(), kRendererX, kRendererY, |
242 rwhv_size.width(), rwhv_size.height()); | 242 rwhv_size.width(), rwhv_size.height()); |
243 popup_->SetBounds(new_bounds); | 243 popup_->SetBounds(new_bounds); |
244 rwhv_->SetSize(rwhv_size); | 244 rwhv_->SetSize(rwhv_size); |
245 } | 245 } |
246 | 246 |
247 RendererPreferences MainMenu::GetRendererPrefs() const { | 247 RendererPreferences MainMenu::GetRendererPrefs(Profile* profile) const { |
248 return renderer_preferences_util::GetInitedRendererPreferences( | 248 return renderer_preferences_util::GetInitedRendererPreferences(profile); |
249 browser_->profile()); | |
250 } | 249 } |
251 | 250 |
252 void MainMenu::CreateNewWindow(int route_id) { | 251 void MainMenu::CreateNewWindow(int route_id) { |
253 if (pending_contents_.get()) { | 252 if (pending_contents_.get()) { |
254 NOTREACHED(); | 253 NOTREACHED(); |
255 return; | 254 return; |
256 } | 255 } |
257 | 256 |
258 helper_.CreateNewWindow(route_id, browser_->profile(), site_instance_, | 257 helper_.CreateNewWindow(route_id, browser_->profile(), site_instance_, |
259 DOMUIFactory::GetDOMUIType(GURL(GetMenuURL())), | 258 DOMUIFactory::GetDOMUIType(GURL(GetMenuURL())), |
(...skipping 27 matching lines...) Expand all Loading... |
287 menu_->Hide(); | 286 menu_->Hide(); |
288 } | 287 } |
289 | 288 |
290 // LoadTask ------------------------------------------------------------------- | 289 // LoadTask ------------------------------------------------------------------- |
291 | 290 |
292 void MainMenu::LoadTask::Run() { | 291 void MainMenu::LoadTask::Run() { |
293 MainMenu::Get(); | 292 MainMenu::Get(); |
294 } | 293 } |
295 | 294 |
296 } // namespace chromeos | 295 } // namespace chromeos |
OLD | NEW |