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

Side by Side Diff: chrome/browser/chromeos/main_menu.cc

Issue 479006: re-apply r34183... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "app/resource_bundle.h" 11 #include "app/resource_bundle.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "chrome/browser/browser_list.h" 15 #include "chrome/browser/browser_list.h"
16 #include "chrome/browser/browser.h" 16 #include "chrome/browser/browser.h"
17 #include "chrome/browser/profile.h" 17 #include "chrome/browser/profile.h"
18 #include "chrome/browser/renderer_host/render_view_host.h" 18 #include "chrome/browser/renderer_host/render_view_host.h"
19 #include "chrome/browser/renderer_host/render_view_host_factory.h" 19 #include "chrome/browser/renderer_host/render_view_host_factory.h"
20 #include "chrome/browser/renderer_host/render_widget_host_view.h" 20 #include "chrome/browser/renderer_host/render_widget_host_view.h"
21 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" 21 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
22 #include "chrome/browser/renderer_host/site_instance.h" 22 #include "chrome/browser/renderer_host/site_instance.h"
23 #include "chrome/browser/renderer_preferences_util.h"
23 #include "chrome/browser/tab_contents/tab_contents.h" 24 #include "chrome/browser/tab_contents/tab_contents.h"
24 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 25 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
25 #include "chrome/common/platform_util.h"
26 #include "grit/app_resources.h" 26 #include "grit/app_resources.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "third_party/skia/include/core/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "views/background.h" 30 #include "views/background.h"
31 #include "views/painter.h" 31 #include "views/painter.h"
32 #include "views/screen.h" 32 #include "views/screen.h"
33 #include "views/widget/root_view.h" 33 #include "views/widget/root_view.h"
34 #include "views/widget/widget_gtk.h" 34 #include "views/widget/widget_gtk.h"
35 35
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
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() const {
248 return platform_util::GetInitedRendererPreferences(); 248 return renderer_preferences_util::GetInitedRendererPreferences();
249 } 249 }
250 250
251 void MainMenu::CreateNewWindow(int route_id) { 251 void MainMenu::CreateNewWindow(int route_id) {
252 if (pending_contents_.get()) { 252 if (pending_contents_.get()) {
253 NOTREACHED(); 253 NOTREACHED();
254 return; 254 return;
255 } 255 }
256 256
257 helper_.CreateNewWindow(route_id, browser_->profile(), site_instance_, 257 helper_.CreateNewWindow(route_id, browser_->profile(), site_instance_,
258 DOMUIFactory::GetDOMUIType(GURL(GetMenuURL())), 258 DOMUIFactory::GetDOMUIType(GURL(GetMenuURL())),
(...skipping 27 matching lines...) Expand all
286 menu_->Hide(); 286 menu_->Hide();
287 } 287 }
288 288
289 // LoadTask ------------------------------------------------------------------- 289 // LoadTask -------------------------------------------------------------------
290 290
291 void MainMenu::LoadTask::Run() { 291 void MainMenu::LoadTask::Run() {
292 MainMenu::Get(); 292 MainMenu::Get();
293 } 293 }
294 294
295 } // namespace chromeos 295 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698