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

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

Issue 8591003: aura: Fix Chrome OS status area browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add include 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
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>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
14 #include "chrome/browser/chromeos/frame/layout_mode_button.h" 14 #include "chrome/browser/chromeos/frame/layout_mode_button.h"
15 #include "chrome/browser/chromeos/frame/panel_browser_view.h" 15 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
16 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 16 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
17 #include "chrome/browser/chromeos/status/network_menu_button.h" 17 #include "chrome/browser/chromeos/status/network_menu_button.h"
18 #include "chrome/browser/chromeos/status/status_area_button.h" 18 #include "chrome/browser/chromeos/status/status_area_button.h"
19 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h" 19 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
20 #include "chrome/browser/chromeos/system/runtime_environment.h" 20 #include "chrome/browser/chromeos/system/runtime_environment.h"
21 #include "chrome/browser/chromeos/view_ids.h"
22 #include "chrome/browser/themes/theme_service.h" 21 #include "chrome/browser/themes/theme_service.h"
23 #include "chrome/browser/themes/theme_service_factory.h" 22 #include "chrome/browser/themes/theme_service_factory.h"
24 #include "chrome/browser/ui/gtk/gtk_util.h" 23 #include "chrome/browser/ui/gtk/gtk_util.h"
25 #include "chrome/browser/ui/views/frame/browser_view.h" 24 #include "chrome/browser/ui/views/frame/browser_view.h"
26 #include "chrome/browser/ui/views/frame/browser_view_layout.h" 25 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
27 #include "chrome/browser/ui/views/tabs/tab.h" 26 #include "chrome/browser/ui/views/tabs/tab.h"
28 #include "chrome/browser/ui/views/tabs/tab_strip.h" 27 #include "chrome/browser/ui/views/tabs/tab_strip.h"
29 #include "chrome/browser/ui/views/theme_background.h" 28 #include "chrome/browser/ui/views/theme_background.h"
30 #include "chrome/browser/ui/views/toolbar_view.h" 29 #include "chrome/browser/ui/views/toolbar_view.h"
31 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 MessageLoopForUI::current()->RemoveObserver(this); 327 MessageLoopForUI::current()->RemoveObserver(this);
329 BrowserList::RemoveObserver(this); 328 BrowserList::RemoveObserver(this);
330 } 329 }
331 330
332 // BrowserView, ::BrowserView overrides: 331 // BrowserView, ::BrowserView overrides:
333 332
334 void BrowserView::Init() { 333 void BrowserView::Init() {
335 ::BrowserView::Init(); 334 ::BrowserView::Init();
336 status_area_ = new StatusAreaViewChromeos(); 335 status_area_ = new StatusAreaViewChromeos();
337 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE); 336 status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE);
338 status_area_->set_id(VIEW_ID_STATUS_AREA);
339 AddChildView(status_area_); 337 AddChildView(status_area_);
340 338
341 layout_mode_button_ = new LayoutModeButton(); 339 layout_mode_button_ = new LayoutModeButton();
342 layout_mode_button_->set_id(VIEW_ID_LAYOUT_MODE_BUTTON);
343 AddChildView(layout_mode_button_); 340 AddChildView(layout_mode_button_);
344 layout_mode_button_->Init(); 341 layout_mode_button_->Init();
345 342
346 frame()->non_client_view()->set_context_menu_controller(this); 343 frame()->non_client_view()->set_context_menu_controller(this);
347 344
348 // Listen to wrench menu opens. 345 // Listen to wrench menu opens.
349 if (toolbar()) 346 if (toolbar())
350 toolbar()->AddMenuListener(this); 347 toolbar()->AddMenuListener(this);
351 348
352 // Listen for PropertyChange events (which we receive in DidProcessEvent()). 349 // Listen for PropertyChange events (which we receive in DidProcessEvent()).
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 637 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
641 // Create a browser view for chromeos. 638 // Create a browser view for chromeos.
642 BrowserView* view; 639 BrowserView* view;
643 if (browser->is_type_popup() || browser->is_type_panel()) 640 if (browser->is_type_popup() || browser->is_type_panel())
644 view = new chromeos::PanelBrowserView(browser); 641 view = new chromeos::PanelBrowserView(browser);
645 else 642 else
646 view = new chromeos::BrowserView(browser); 643 view = new chromeos::BrowserView(browser);
647 (new BrowserFrame(view))->InitBrowserFrame(); 644 (new BrowserFrame(view))->InitBrowserFrame();
648 return view; 645 return view;
649 } 646 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/frame/layout_mode_button.cc » ('j') | ui/aura_shell/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698