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

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

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 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 | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/login/background_view.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) 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/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>
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // global namespace. Check the chrome/browser/ui/views/frame/browser_view.h 345 // global namespace. Check the chrome/browser/ui/views/frame/browser_view.h
346 // file for details. 346 // file for details.
347 return static_cast<chromeos::BrowserView*>( 347 return static_cast<chromeos::BrowserView*>(
348 ::BrowserView::GetBrowserViewForBrowser(browser)); 348 ::BrowserView::GetBrowserViewForBrowser(browser));
349 } 349 }
350 350
351 // BrowserView, ::BrowserView overrides: 351 // BrowserView, ::BrowserView overrides:
352 352
353 void BrowserView::Init() { 353 void BrowserView::Init() {
354 ::BrowserView::Init(); 354 ::BrowserView::Init();
355 StatusAreaViewChromeos::SetScreenMode(StatusAreaViewChromeos::BROWSER_MODE);
355 status_area_ = new StatusAreaViewChromeos(); 356 status_area_ = new StatusAreaViewChromeos();
356 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE); 357 status_area_->Init(this);
357 AddChildView(status_area_); 358 AddChildView(status_area_);
358 359
359 layout_mode_button_ = new LayoutModeButton(); 360 layout_mode_button_ = new LayoutModeButton();
360 AddChildView(layout_mode_button_); 361 AddChildView(layout_mode_button_);
361 layout_mode_button_->Init(); 362 layout_mode_button_->Init();
362 363
363 frame()->non_client_view()->set_context_menu_controller(this); 364 frame()->non_client_view()->set_context_menu_controller(this);
364 365
365 // Listen to wrench menu opens. 366 // Listen to wrench menu opens.
366 if (toolbar()) 367 if (toolbar())
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 658 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
658 // Create a browser view for chromeos. 659 // Create a browser view for chromeos.
659 BrowserView* view; 660 BrowserView* view;
660 if (browser->is_type_popup() || browser->is_type_panel()) 661 if (browser->is_type_popup() || browser->is_type_panel())
661 view = new chromeos::PanelBrowserView(browser); 662 view = new chromeos::PanelBrowserView(browser);
662 else 663 else
663 view = new chromeos::BrowserView(browser); 664 view = new chromeos::BrowserView(browser);
664 (new BrowserFrame(view))->InitBrowserFrame(); 665 (new BrowserFrame(view))->InitBrowserFrame();
665 return view; 666 return view;
666 } 667 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/login/background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698