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

Side by Side Diff: chrome/browser/views/frame/browser_view.cc

Issue 18248: CommandLine API rework (Closed)
Patch Set: fixes Created 11 years, 11 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
« no previous file with comments | « chrome/browser/user_data_manager.cc ('k') | chrome/common/child_process.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "base/command_line.h" 5 #include "base/command_line.h"
6 6
7 #include "chrome/browser/views/frame/browser_view.h" 7 #include "chrome/browser/views/frame/browser_view.h"
8 8
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 /////////////////////////////////////////////////////////////////////////////// 318 ///////////////////////////////////////////////////////////////////////////////
319 // BrowserView, BrowserWindow implementation: 319 // BrowserView, BrowserWindow implementation:
320 320
321 void BrowserView::Init() { 321 void BrowserView::Init() {
322 // Stow a pointer to this object onto the window handle so that we can get 322 // Stow a pointer to this object onto the window handle so that we can get
323 // at it later when all we have is a HWND. 323 // at it later when all we have is a HWND.
324 SetProp(GetWidget()->GetHWND(), kBrowserWindowKey, this); 324 SetProp(GetWidget()->GetHWND(), kBrowserWindowKey, this);
325 325
326 // Start a hung plugin window detector for this browser object (as long as 326 // Start a hung plugin window detector for this browser object (as long as
327 // hang detection is not disabled). 327 // hang detection is not disabled).
328 if (!CommandLine().HasSwitch(switches::kDisableHangMonitor)) 328 if (!CommandLine::ForCurrentProcess()->HasSwitch(
329 switches::kDisableHangMonitor)) {
329 InitHangMonitor(); 330 InitHangMonitor();
331 }
330 332
331 LoadAccelerators(); 333 LoadAccelerators();
332 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); 334 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
333 335
334 tabstrip_ = new TabStrip(browser_->tabstrip_model()); 336 tabstrip_ = new TabStrip(browser_->tabstrip_model());
335 tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP)); 337 tabstrip_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TABSTRIP));
336 AddChildView(tabstrip_); 338 AddChildView(tabstrip_);
337 339
338 toolbar_ = new BrowserToolbarView(browser_->controller(), browser_.get()); 340 toolbar_ = new BrowserToolbarView(browser_->controller(), browser_.get());
339 AddChildView(toolbar_); 341 AddChildView(toolbar_);
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 1361
1360 // static 1362 // static
1361 void BrowserView::InitClass() { 1363 void BrowserView::InitClass() {
1362 static bool initialized = false; 1364 static bool initialized = false;
1363 if (!initialized) { 1365 if (!initialized) {
1364 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1366 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1365 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); 1367 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
1366 initialized = true; 1368 initialized = true;
1367 } 1369 }
1368 } 1370 }
OLDNEW
« no previous file with comments | « chrome/browser/user_data_manager.cc ('k') | chrome/common/child_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698