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

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

Issue 10883065: views: Move invert_bubble_view.* into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/accessibility/invert_bubble_view.cc ('k') | no next file » | 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) 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/ui/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 // If we do find there are cases where we need to restore the focus on show, 573 // If we do find there are cases where we need to restore the focus on show,
574 // that should be added and this should be removed. 574 // that should be added and this should be removed.
575 RestoreFocus(); 575 RestoreFocus();
576 576
577 frame_->Show(); 577 frame_->Show();
578 578
579 force_location_bar_focus_ = false; 579 force_location_bar_focus_ = false;
580 580
581 browser()->OnWindowDidShow(); 581 browser()->OnWindowDidShow();
582 582
583 browser::MaybeShowInvertBubbleView(browser_.get(), contents_); 583 chrome::MaybeShowInvertBubbleView(browser_.get(), contents_);
584 } 584 }
585 585
586 void BrowserView::ShowInactive() { 586 void BrowserView::ShowInactive() {
587 if (frame_->IsVisible()) 587 if (frame_->IsVisible())
588 return; 588 return;
589 CreateLauncherIcon(); 589 CreateLauncherIcon();
590 frame_->ShowInactive(); 590 frame_->ShowInactive();
591 } 591 }
592 592
593 void BrowserView::SetBounds(const gfx::Rect& bounds) { 593 void BrowserView::SetBounds(const gfx::Rect& bounds) {
(...skipping 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 1870
1871 bool BrowserView::SplitHandleMoved(views::SingleSplitView* sender) { 1871 bool BrowserView::SplitHandleMoved(views::SingleSplitView* sender) {
1872 for (int i = 0; i < sender->child_count(); ++i) 1872 for (int i = 0; i < sender->child_count(); ++i)
1873 sender->child_at(i)->InvalidateLayout(); 1873 sender->child_at(i)->InvalidateLayout();
1874 SchedulePaint(); 1874 SchedulePaint();
1875 Layout(); 1875 Layout();
1876 return false; 1876 return false;
1877 } 1877 }
1878 1878
1879 void BrowserView::OnSysColorChange() { 1879 void BrowserView::OnSysColorChange() {
1880 browser::MaybeShowInvertBubbleView(browser_.get(), contents_); 1880 chrome::MaybeShowInvertBubbleView(browser_.get(), contents_);
1881 } 1881 }
1882 1882
1883 int BrowserView::GetOTRIconResourceID() const { 1883 int BrowserView::GetOTRIconResourceID() const {
1884 int otr_resource_id = IDR_OTR_ICON; 1884 int otr_resource_id = IDR_OTR_ICON;
1885 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { 1885 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
1886 if (IsFullscreen()) 1886 if (IsFullscreen())
1887 otr_resource_id = IDR_OTR_ICON_FULLSCREEN; 1887 otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
1888 #if defined(OS_WIN) && !defined(USE_AURA) 1888 #if defined(OS_WIN) && !defined(USE_AURA)
1889 if (base::win::IsMetroProcess()) 1889 if (base::win::IsMetroProcess())
1890 otr_resource_id = IDR_OTR_ICON_FULLSCREEN; 1890 otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
2609 2609
2610 Browser* modal_browser = 2610 Browser* modal_browser =
2611 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2611 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2612 if (modal_browser && (browser_ != modal_browser)) { 2612 if (modal_browser && (browser_ != modal_browser)) {
2613 modal_browser->window()->FlashFrame(true); 2613 modal_browser->window()->FlashFrame(true);
2614 modal_browser->window()->Activate(); 2614 modal_browser->window()->Activate();
2615 } 2615 }
2616 2616
2617 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2617 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2618 } 2618 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accessibility/invert_bubble_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698