OLD | NEW |
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/chromeos/frame/browser_view.h" | 5 #include "chrome/browser/chromeos/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
| 12 #include "base/chromeos/chromeos_version.h" |
12 #include "base/command_line.h" | 13 #include "base/command_line.h" |
13 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
14 #include "chrome/browser/chromeos/frame/layout_mode_button.h" | 15 #include "chrome/browser/chromeos/frame/layout_mode_button.h" |
15 #include "chrome/browser/chromeos/frame/panel_browser_view.h" | 16 #include "chrome/browser/chromeos/frame/panel_browser_view.h" |
16 #include "chrome/browser/chromeos/status/input_method_menu_button.h" | 17 #include "chrome/browser/chromeos/status/input_method_menu_button.h" |
17 #include "chrome/browser/chromeos/status/network_menu_button.h" | 18 #include "chrome/browser/chromeos/status/network_menu_button.h" |
18 #include "chrome/browser/chromeos/status/status_area_button.h" | 19 #include "chrome/browser/chromeos/status/status_area_button.h" |
19 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h" | 20 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h" |
20 #include "chrome/browser/chromeos/system/runtime_environment.h" | |
21 #include "chrome/browser/themes/theme_service.h" | 21 #include "chrome/browser/themes/theme_service.h" |
22 #include "chrome/browser/themes/theme_service_factory.h" | 22 #include "chrome/browser/themes/theme_service_factory.h" |
23 #include "chrome/browser/ui/gtk/gtk_util.h" | 23 #include "chrome/browser/ui/gtk/gtk_util.h" |
24 #include "chrome/browser/ui/views/frame/browser_view.h" | 24 #include "chrome/browser/ui/views/frame/browser_view.h" |
25 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 25 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
26 #include "chrome/browser/ui/views/tabs/tab.h" | 26 #include "chrome/browser/ui/views/tabs/tab.h" |
27 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 27 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
28 #include "chrome/browser/ui/views/theme_background.h" | 28 #include "chrome/browser/ui/views/theme_background.h" |
29 #include "chrome/browser/ui/views/toolbar_view.h" | 29 #include "chrome/browser/ui/views/toolbar_view.h" |
30 #include "chrome/common/chrome_switches.h" | 30 #include "chrome/common/chrome_switches.h" |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
420 return new BrowserViewLayout(); | 420 return new BrowserViewLayout(); |
421 } | 421 } |
422 | 422 |
423 void BrowserView::ChildPreferredSizeChanged(View* child) { | 423 void BrowserView::ChildPreferredSizeChanged(View* child) { |
424 Layout(); | 424 Layout(); |
425 } | 425 } |
426 | 426 |
427 bool BrowserView::GetSavedWindowPlacement( | 427 bool BrowserView::GetSavedWindowPlacement( |
428 gfx::Rect* bounds, | 428 gfx::Rect* bounds, |
429 ui::WindowShowState* show_state) const { | 429 ui::WindowShowState* show_state) const { |
430 if (system::runtime_environment::IsRunningOnChromeOS() || | 430 if (base::chromeos::IsRunningOnChromeOS() || |
431 CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) { | 431 CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) { |
432 // Typically we don't request a full screen size. This means we'll request a | 432 // Typically we don't request a full screen size. This means we'll request a |
433 // non-full screen size, layout/paint at that size, then the window manager | 433 // non-full screen size, layout/paint at that size, then the window manager |
434 // will snap us to full screen size. This results in an ugly | 434 // will snap us to full screen size. This results in an ugly |
435 // resize/paint. To avoid this we always request a full screen size. | 435 // resize/paint. To avoid this we always request a full screen size. |
436 *bounds = GetWidget()->GetWorkAreaBoundsInScreen(); | 436 *bounds = GetWidget()->GetWorkAreaBoundsInScreen(); |
437 *show_state = ui::SHOW_STATE_NORMAL; | 437 *show_state = ui::SHOW_STATE_NORMAL; |
438 return true; | 438 return true; |
439 } | 439 } |
440 return ::BrowserView::GetSavedWindowPlacement(bounds, show_state); | 440 return ::BrowserView::GetSavedWindowPlacement(bounds, show_state); |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 634 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
635 // Create a browser view for chromeos. | 635 // Create a browser view for chromeos. |
636 BrowserView* view; | 636 BrowserView* view; |
637 if (browser->is_type_popup() || browser->is_type_panel()) | 637 if (browser->is_type_popup() || browser->is_type_panel()) |
638 view = new chromeos::PanelBrowserView(browser); | 638 view = new chromeos::PanelBrowserView(browser); |
639 else | 639 else |
640 view = new chromeos::BrowserView(browser); | 640 view = new chromeos::BrowserView(browser); |
641 (new BrowserFrame(view))->InitBrowserFrame(); | 641 (new BrowserFrame(view))->InitBrowserFrame(); |
642 return view; | 642 return view; |
643 } | 643 } |
OLD | NEW |