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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 8584001: Remove unused "maximized" parameter from WindowSizer::GetBrowserWindowBounds(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « chrome/browser/extensions/extension_tabs_module.cc ('k') | chrome/browser/ui/panels/panel.cc » ('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) 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 if (record_mode || playback_mode) { 891 if (record_mode || playback_mode) {
892 // In playback/record mode we always fix the size of the browser and 892 // In playback/record mode we always fix the size of the browser and
893 // move it to (0,0). The reason for this is two reasons: First we want 893 // move it to (0,0). The reason for this is two reasons: First we want
894 // resize/moves in the playback to still work, and Second we want 894 // resize/moves in the playback to still work, and Second we want
895 // playbacks to work (as much as possible) on machines w/ different 895 // playbacks to work (as much as possible) on machines w/ different
896 // screen sizes. 896 // screen sizes.
897 return gfx::Rect(0, 0, 800, 600); 897 return gfx::Rect(0, 0, 800, 600);
898 } 898 }
899 899
900 gfx::Rect restored_bounds = override_bounds_; 900 gfx::Rect restored_bounds = override_bounds_;
901 bool maximized;
902 WindowSizer::GetBrowserWindowBounds(app_name_, restored_bounds, this, 901 WindowSizer::GetBrowserWindowBounds(app_name_, restored_bounds, this,
903 &restored_bounds, &maximized); 902 &restored_bounds);
904 return restored_bounds; 903 return restored_bounds;
905 } 904 }
906 905
907 ui::WindowShowState Browser::GetSavedWindowShowState() const { 906 ui::WindowShowState Browser::GetSavedWindowShowState() const {
908 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized)) 907 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
909 return ui::SHOW_STATE_MAXIMIZED; 908 return ui::SHOW_STATE_MAXIMIZED;
910 909
911 if (show_state_ != ui::SHOW_STATE_DEFAULT) 910 if (show_state_ != ui::SHOW_STATE_DEFAULT)
912 return show_state_; 911 return show_state_;
913 912
(...skipping 4601 matching lines...) Expand 10 before | Expand all | Expand 10 after
5515 } 5514 }
5516 5515
5517 void Browser::UpdateFullscreenExitBubbleContent() { 5516 void Browser::UpdateFullscreenExitBubbleContent() {
5518 GURL url; 5517 GURL url;
5519 if (fullscreened_tab_) 5518 if (fullscreened_tab_)
5520 url = fullscreened_tab_->tab_contents()->GetURL(); 5519 url = fullscreened_tab_->tab_contents()->GetURL();
5521 5520
5522 window_->UpdateFullscreenExitBubbleContent( 5521 window_->UpdateFullscreenExitBubbleContent(
5523 url, GetFullscreenExitBubbleType()); 5522 url, GetFullscreenExitBubbleType());
5524 } 5523 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_tabs_module.cc ('k') | chrome/browser/ui/panels/panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698